Revert "Merge pull request Baystation12#20674 from mustafakalash/useo…

…fforce"

This reverts commit 2957f29, reversing
changes made to d2a789c.

Conflicts:
	icons/turf/space.dmi
	maps/torch/torch-3.dmm

code/datums/colors/color_generator.dm

@@ -4,7 +4,7 @@ decl/color_generator
 	var/max_random_span = 25
 
 /decl/color_generator/proc/GenerateHex()
-	. = GenerateRGB()
+	. = create_color()
 	. = rgb(.[1], .[2], .[3])
 
 /decl/color_generator/proc/GenerateRGB()

code/game/objects/items/devices/PDA/PDA.dm

@@ -60,7 +60,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
 	var/ownjob = null //related to above - this is assignment (potentially alt title)
 	var/ownrank = null // this one is rank, never alt title
-	var/pen = /obj/item/weapon/pen //determines what kind of pen spawns in a PDA
 
 	var/obj/item/device/paicard/pai = null	// A slot for a personal AI device
 
@@ -122,9 +121,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-h"
 	news_silent = 1
 
-/obj/item/device/pda/heads/paperpusher
-	pen = /obj/item/weapon/pen/fancy
-
 /obj/item/device/pda/heads/hop
 	default_cartridge = /obj/item/weapon/cartridge/hop
 	icon_state = "pda-hop"
@@ -326,7 +322,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	PDAs = sortAtom(PDAs)
 	if(default_cartridge)
 		cartridge = new default_cartridge(src)
-	new pen(src)
+	new /obj/item/weapon/pen(src)
 
 /obj/item/device/pda/proc/can_use()
 

code/game/objects/items/weapons/weaponry.dm

@@ -1,22 +1,22 @@
 /obj/item/weapon/nullrod
-	name = "null sceptre"
-	desc = "A sceptre of pure black obsidian capped at both ends with silver ferrules. Some religious groups claim it disrupts and dampens the powers of paranormal phenomenae."
+	name = "null rod"
+	desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae."
 	icon_state = "nullrod"
 	item_state = "nullrod"
 	slot_flags = SLOT_BELT
-	force = 10
+	force = 15
 	throw_speed = 1
 	throw_range = 4
-	throwforce = 7
-	w_class = ITEM_SIZE_NORMAL
+	throwforce = 10
+	w_class = ITEM_SIZE_SMALL
 
 /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod.
 	admin_attack_log(user, M, "Attacked using \a [src]", "Was attacked with \a [src]", "used \a [src] to attack")
 
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	user.do_attack_animation(M)
 	//if(user != M)
-	if(M.mind && LAZYLEN(M.mind.learned_spells))
+	if(M.mind && M.mind.learned_spells)
 		M.silence_spells(300) //30 seconds
 		to_chat(M, "<span class='danger'>You've been silenced!</span>")
 		return
@@ -41,18 +41,11 @@
 /obj/item/weapon/nullrod/afterattack(var/atom/A, var/mob/user, var/proximity)
 	if(!proximity)
 		return
-
 	if(istype(A, /turf/simulated/wall/cult))
 		var/turf/simulated/wall/cult/W = A
-		user.visible_message("<span class='notice'>\The [user] touches \the [A] with \the [src], and the enchantment affecting it fizzles away.</span>", "<span class='notice'>You touch \the [A] with \the [src], and the enchantment affecting it fizzles away.</span>")
+		user.visible_message("<span class='notice'>\The [user] touches \the [A] with \the [src] and it starts fizzling and shifting.</span>", "<span class='notice'>You touch \the [A] with \the [src] and it starts fizzling and shifting.</span>")
 		W.ChangeTurf(/turf/simulated/wall)
 
-	if(istype(A, /turf/simulated/floor/cult))
-		var/turf/simulated/floor/cult/F = A
-		user.visible_message("<span class='notice'>\The [user] touches \the [A] with \the [src], and the enchantment affecting it fizzles away.</span>", "<span class='notice'>You touch \the [A] with \the [src], and the enchantment affecting it fizzles away.</span>")
-		F.ChangeTurf(/turf/simulated/floor)
-
-
 /obj/item/weapon/energy_net
 	name = "energy net"
 	desc = "It's a net made of green energy."

code/game/objects/structures/girders.dm

@@ -100,11 +100,8 @@
 		if(do_after(user, 40,src))
 			if(!src) return
 			to_chat(user, "<span class='notice'>You removed the support struts!</span>")
-
-			if(reinf_material)
-				reinf_material.place_dismantled_product(get_turf(src))
-				reinf_material = null
-
+			reinf_material.place_dismantled_product(get_turf(src))
+			reinf_material = null
 			reset_girder()
 
 	else if(isCrowbar(W) && state == 0 && anchored)

code/game/objects/structures/rubble.dm

@@ -12,7 +12,6 @@
 	var/lootleft = 2
 	var/emptyprob = 30
 	var/health = 40
-	var/is_rummaging = 0
 
 /obj/structure/rubble/New()
 	..()
@@ -46,21 +45,16 @@
 	overlays = parts
 
 /obj/structure/rubble/attack_hand(mob/user)
-	if(!is_rummaging)
-		if(!lootleft)
-			to_chat(user, "<span class='warning'>There's nothing left in this one but unusable garbage...</span>")
-			return
-		visible_message("[user] starts rummaging through \the [src].")
-		is_rummaging = 1
-		if(do_after(user, 30))
-			var/obj/item/booty = pick(loot)
-			booty = new booty(loc)
-			lootleft--
-			update_icon()
-			to_chat(user, "<span class='notice'>You find \a [booty] and pull it carefully out of \the [src].</span>")
-		is_rummaging = 0
-	else
-		to_chat(user, "<span class='warning'>Someone is already rummaging here!</span>")
+	if(!lootleft)
+		to_chat(user, "<span class='warning'>There's nothing left in this one but unusable garbage...</span>")
+		return
+	visible_message("[user] starts rummaging through \the [src].")
+	if(do_after(user, 30))
+		var/obj/item/booty = pick(loot)
+		booty = new booty(loc)
+		lootleft--
+		update_icon()
+		to_chat(user, "<span class='notice'>You find \a [booty] and pull it carefully out of \the [src].</span>")
 
 /obj/structure/rubble/attackby(var/obj/item/I, var/mob/user)
 	if (istype(I, /obj/item/weapon/pickaxe))

code/modules/client/preference_setup/loadout/lists/uniforms.dm

@@ -162,7 +162,6 @@
 	corps += /obj/item/clothing/under/grayson
 	corps += /obj/item/clothing/under/focal
 	corps += /obj/item/clothing/under/rank/ntwork
-	corps += /obj/item/clothing/under/morpheus
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(corps)
 
 /datum/gear/uniform/sterile

code/modules/clothing/under/accessories/badges.dm

@@ -17,14 +17,11 @@
 	stored_name = new_name
 	name = "[initial(name)] ([stored_name])"
 
-/obj/item/clothing/accessory/badge/proc/set_desc(var/mob/living/carbon/human/H)
-
 /obj/item/clothing/accessory/badge/attack_self(mob/user as mob)
 
 	if(!stored_name)
 		to_chat(user, "You inspect your [src.name]. Everything seems to be in order and you give it a quick cleaning with your hand.")
 		set_name(user.real_name)
-		set_desc(user)
 		return
 
 	if(isliving(user))
@@ -57,8 +54,7 @@
 /obj/item/clothing/accessory/badge/holo/NT
 	name = "\improper NT holobadge"
 	desc = "This glowing red badge marks the holder as a member of NanoTrasen corporate security."
-	icon_state = "ntholobadge"
-	color = COLOR_WHITE
+	color = "#b7310b" //brighter COLOR_NT_RED
 	badge_string = "NanoTrasen Security"
 	badge_access = access_research
 

code/modules/clothing/under/miscellaneous.dm

@@ -582,12 +582,6 @@
 	icon_state = "mbill"
 	worn_state = "mbill"
 
-/obj/item/clothing/under/morpheus
-	name = "\improper Morpheus Cyberkinetics uniform"
-	desc = "A pair of overalls belonging to Morpheus Cyberkinetics, an IPC manufacturing company. It doesn't look like it would be comfortable on a human."
-	icon_state = "morpheus"
-	worn_state = "morpheus"
-
 // Replace this with actual uniform when someone wants to sprite one
 /obj/item/clothing/under/confederacy
 	name = "\improper Confederate uniform"

code/modules/mob/grab/grab_object.dm

@@ -88,10 +88,6 @@
 
 /obj/item/grab/proc/can_grab()
 
-	// can't grab non-carbon/human/'s
-	if(!istype(affecting))
-		return 0
-
 	if(assailant.anchored || affecting.anchored)
 		return 0
 

code/modules/mob/living/carbon/human/human_organs.dm

@@ -73,7 +73,7 @@
 
 	// Can't fall if nothing pulls you down
 	var/area/area = get_area(src)
-	if (!area || !area.has_gravity())
+	if (!area.has_gravity())
 		return
 
 	var/limb_pain

code/modules/mob/living/simple_animal/hostile/bat.dm

@@ -1,6 +1,6 @@
 /mob/living/simple_animal/hostile/scarybat
 	name = "space bats"
-	desc = "A swarm of cute little blood sucking bats - they look pretty upset."
+	desc = "A swarm of cute little blood sucking bats that looks pretty upset."
 	icon = 'icons/mob/bats.dmi'
 	icon_state = "bat"
 	icon_living = "bat"

code/modules/mob/living/simple_animal/hostile/creature.dm

@@ -14,13 +14,15 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = "creature"
 	speed = 4
-	supernatural = 1
 
 /mob/living/simple_animal/hostile/creature/cult
 	faction = "cult"
+
 	min_gas = null
 	max_gas = null
 	minbodytemp = 0
 
+	supernatural = 1
+
 /mob/living/simple_animal/hostile/creature/cult/cultify()
-	return
+	return

code/modules/mob/living/simple_animal/hostile/faithful_hound.dm

@@ -19,7 +19,6 @@
 	var/list/allowed_mobs = list() //Who we allow past us
 	var/last_check = 0
 	faction = "cute ghost dogs"
-	supernatural = 1
 
 /mob/living/simple_animal/faithful_hound/death()
 	new /obj/item/weapon/ectoplasm (get_turf(src))

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -25,7 +25,6 @@
 	speed = 4
 
 	faction = "faithless"
-	supernatural = 1
 
 /mob/living/simple_animal/hostile/faithless/Allow_Spacemove(var/check_drift = 0)
 	return 1

code/modules/mob/living/simple_animal/parrot.dm

@@ -719,14 +719,14 @@
 /mob/living/simple_animal/parrot/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
 	if(prob(50))
 		parrot_hear(message)
-	..()
+	..(message,verb,language,alt_name,italics,speaker)
 
 
 
 /mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/part_c, var/mob/speaker = null, var/hard_to_hear = 0)
 	if(prob(50) && available_channels.len)
 		parrot_hear("[pick(available_channels)] [message]")
-	..()
+	..(message,verb,language,part_a,part_b,speaker,hard_to_hear)
 
 
 /mob/living/simple_animal/parrot/proc/parrot_hear(var/message="")

code/modules/mob/living/simple_animal/shade.dm

@@ -25,7 +25,6 @@
 	stop_automated_movement = 1
 	status_flags = 0
 	faction = "cult"
-	supernatural = 1
 	status_flags = CANPUSH
 
 /mob/living/simple_animal/shade/cultify()

code/modules/paperwork/paper.dm

@@ -34,7 +34,6 @@
 	var/const/deffont = "Verdana"
 	var/const/signfont = "Times New Roman"
 	var/const/crayonfont = "Comic Sans MS"
-	var/const/fancyfont = "Segoe Script"
 
 /obj/item/weapon/paper/New(loc, text,title)
 	..(loc)
@@ -194,7 +193,7 @@
 		return P.get_signature(user)
 	return (user && user.real_name) ? user.real_name : "Anonymous"
 
-/obj/item/weapon/paper/proc/parsepencode(t, obj/item/weapon/pen/P, mob/user, iscrayon, isfancy)
+/obj/item/weapon/paper/proc/parsepencode(t, obj/item/weapon/pen/P, mob/user, iscrayon)
 	if(length(t) == 0)
 		return ""
 
@@ -216,8 +215,6 @@
 
 	if(iscrayon)
 		t = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[t]</b></font>"
-	else if(isfancy)
-		t = "<font face=\"[fancyfont]\" color=[P ? P.colour : "black"]><i>[t]</i></font>"
 	else
 		t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
 
@@ -278,9 +275,8 @@
 		if(!t)
 			return
 
-		var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check what type of pen
+		var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
 		var/iscrayon = 0
-		var/isfancy = 0
 		if(!istype(i, /obj/item/weapon/pen))
 			if(usr.back && istype(usr.back,/obj/item/weapon/rig))
 				var/obj/item/weapon/rig/r = usr.back
@@ -295,17 +291,14 @@
 		if(istype(i, /obj/item/weapon/pen/crayon))
 			iscrayon = 1
 
-		if(istype(i, /obj/item/weapon/pen/fancy))
-			isfancy = 1
-
 
 		// if paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr
 		if(src.loc != usr && !src.Adjacent(usr) && !((istype(src.loc, /obj/item/weapon/clipboard) || istype(src.loc, /obj/item/weapon/folder)) && (src.loc.loc == usr || src.loc.Adjacent(usr)) ) )
 			return
 
 		var/last_fields_value = fields
 
-		t = parsepencode(t, i, usr, iscrayon, isfancy) // Encode everything from pencode to html
+		t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html
 
 
 		if(fields > 50)//large amount of fields creates a heavy load on the server, see updateinfolinks() and addtofield()

code/modules/paperwork/pen.dm

@@ -3,8 +3,6 @@
  *		Pens
  *		Sleepy Pens
  *		Parapens
- *		Crayons
- *		Fountain pens
  */
 
 
@@ -203,14 +201,6 @@
 	var/colourName = "red" //for updateIcon purposes
 	color_description = "red crayon"
 
-/obj/item/weapon/pen/crayon/Initialize()
-	name = "[colourName] crayon"
-	. = ..()
-
-/obj/item/weapon/pen/fancy
-	name = "fancy pen"
-	desc = "A high quality traditional fountain pen with an internal reservoir and an extra fine gold-platinum nib. Guaranteed never to leak."
-	icon_state = "fancy"
-	throwforce = 1 //pointy
-	colour = "#1c1713" //dark ashy brownish
-	matter = list(DEFAULT_WALL_MATERIAL = 15)
+	New()
+		name = "[colourName] crayon"
+		..()

code/modules/xenoarcheaology/effect.dm

@@ -123,8 +123,8 @@
 	var/protected = 0
 
 	//anomaly suits give best protection, but excavation suits are almost as good
-	if(istype(H.back,/obj/item/weapon/rig/hazmat) || istype(H.back, /obj/item/weapon/rig/hazard))
-		var/obj/item/weapon/rig/rig = H.back
+	if(istype(H.back,/obj/item/weapon/rig/hazmat))
+		var/obj/item/weapon/rig/hazmat/rig = H.back
 		if(rig.suit_is_deployed() && !rig.offline)
 			protected += 1
 

html/changelogs/.all_changelog.yml

@@ -6976,21 +6976,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       have gravitation.
   chaoko99:
   - rscadd: Ctrl clicking a table will flip or unflip it.
-2018-02-25:
-  Hubblenaut:
-  - bugfix: Fixes the handheld teleporter only working as expected when adjacent to
-      teleporter hub.
-  - bugfix: Fixes the ref2name converter only working when adjacent to target.
-  - tweak: Medical scanner integrated circuits now work in vision range.
-  - bugfix: Fixes ducttape not being able to be picked up.
-2018-02-26:
-  Banditoz:
-  - rscadd: Dog tags now have useful information on them upon spawn, including branch,
-      religion, and blood type.
-2018-02-27:
-  sabiram:
-  - rscadd: The null rod can now purify cult floors in addition to walls.
-  - balance: The null rod's damage has been reduced.
-  - tweak: Maw creatures, ghost dogs, faithless and shades are now take additional
-      damage from the null rod.
-  - tweak: The null rod is now the null sceptre, a normal sized item.

html/changelogs/AutoChangeLog-pr-20616.yml

@@ -0,0 +1,4 @@
+author: "Hubblenaut"
+delete-after: True
+changes: 
+  - bugfix: "Fixes ducttape not being able to be picked up."