Commit Graph

19251 Commits

Author SHA1 Message Date
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles.
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
2015-06-07 12:31:55 -04:00
Chinsky
bb824dba42 Merge pull request #9721 from atlantiscze/apcfix
Refactors /obj/item/apc_frame to /obj/item/frame/apc
2015-06-07 12:43:01 +03:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
2015-06-07 10:30:27 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog
Syringe gun logs, logging helper reorganization
2015-06-07 09:00:21 +02:00
PsiOmegaDelta
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap
Adjusts how reagents_explosion applies bombcap.
2015-06-07 08:50:45 +02:00
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn
Fixes #9685.
2015-06-07 15:06:09 +09:30
Atlantis
0135051498 Fixes #9706
- Adds checks whether the turf exists. This should prevent runtimes.
- Moves ..() call in food/snacks/grown after seed.thrown_at() call. I believe this was causing the runtime in first place.
2015-06-07 06:43:50 +02:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
Atlantis
bb33905803 Fixes minor typo in organ Destroy() 2015-06-07 05:29:43 +02:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
mwerezak
636ead5bbe Makes reagents_explosion apply bombcap in the same manner as tank transfer valves.
Also fixed reagents_explosion/start() checking the flash var instead of the flashing var.

Fixes #8280
2015-06-06 22:17:11 -04:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze
Fixes #9597
2015-06-07 03:14:06 +01:00
Zuhayr
22bf5352a3 Merge pull request #9698 from PsiOmegaDelta/150605-ChockingLogs
Fixes #9697
2015-06-07 11:27:32 +09:30
mwerezak
f62cc38883 Adds logging for syringe_gun
Also updates holder get_reagents() output formatting
2015-06-06 17:02:42 -04:00
mwerezak
e7757de068 Moves key_name() to logging.dm 2015-06-06 17:01:31 -04:00
PsiOmegaDelta
c4ecf46a4c Merge pull request #9713 from mwerezak/gunlag
Muzzle flash sets lighting instead of creating objs
2015-06-06 21:19:11 +02:00
GinjaNinja32
5f75e3038e Merge pull request #9710 from atlantiscze/beyond-undestructible
Fixes #9705
2015-06-06 20:16:17 +01:00
GinjaNinja32
dc40298fe8 Merge pull request #9703 from atlantiscze/stop-runtiming
Fixes #9619
2015-06-06 20:08:27 +01:00
mwerezak
15d82778cd Muzzle flash sets lighting instead of creating objs
Shooting a gun no longer generates illumination objects
2015-06-06 12:57:43 -04:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
Atlantis
265719b4aa Fixes #9705
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
2015-06-06 17:30:43 +02:00
PsiOmega
cbead4224b Fixes #9685.
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
2015-06-06 15:44:49 +02:00
PsiOmegaDelta
e48b527c4b Merge pull request #9708 from atlantiscze/newmalf-manual-change
RSC paths for ai_help command
2015-06-06 15:41:24 +02:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Atlantis
8a5a969002 More Destroy()s, better implementation
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
2015-06-06 11:04:41 +02:00
Atlantis
b16bf61d03 Implements Destroy() for buildable SMES units.
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
2015-06-06 09:43:39 +02:00
Atlantis
69e0ebf71e Implements Destroy() for organs
- This fixes annoying roundstart GC errors, and should fix other limb/organ related GC errors as well.
2015-06-06 07:21:34 +02:00
Atlantis
f66e5c9c94 Fixes #9619 2015-06-06 06:52:42 +02:00
Atlantis
4b19e8be69 Fixes #9548
- AI's name is now correctly displayed when the AI is clientless while being grabbed with intellicard.
- AI's wireless radio is no longer automatically muted when the AI is transferred to intellicard. It may still be muted from the UI if the intellicard's owner wants it.
2015-06-06 06:28:46 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e Fixes a pair of null.z runtimes
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
2015-06-06 02:23:06 +01:00
PsiOmega
711eb0501c Fixes #9697
Replaces and closes the <span>
2015-06-05 21:17:11 +02:00
PsiOmegaDelta
2da0a5e979 Merge pull request #9690 from Kelenius/ofPuffsAndCleaner
Of puffs and cleaner
2015-06-05 20:02:08 +02:00
Kelenius
345cd7a738 Adds a simulated check to chempuffs 2015-06-05 19:20:46 +03:00
Zuhayr
589aecd40e Merge pull request #9691 from Baystation12/master
master into dev-freeze
2015-06-05 21:41:58 +09:30
Chinsky
19e0a94c17 Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat
Removes some qdel:s of lists.
2015-06-05 15:10:53 +03:00
Chinsky
f163650cb2 Merge pull request #9652 from mwerezak/inflatable
Corrects comment, multiz stub, no-zone default
2015-06-05 14:48:30 +03:00
Kelenius
2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner
Conflicts:
	code/game/objects/effects/chem/water.dm
2015-06-05 14:36:15 +03:00
Chinsky
e1d6af1d27 Fixes #9352 2015-06-05 14:30:01 +03:00
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists.
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta
c21985f39d Merge pull request #9679 from GinjaNinja32/humans_are_not_hats
Removes briefcase instastun and crappy helmet check
2015-06-05 10:17:02 +02:00
Zuhayr
c3c40ed7f5 Merge pull request #9665 from PsiOmegaDelta/150604-DatumPool
Fixes #9664.
2015-06-05 17:36:31 +09:30
GinjaNinja32
67ccb6997b Entirely removes briefcase instastun and pointless New() definition 2015-06-05 09:00:19 +01:00
Chinsky
74cbb2c5d8 Merge pull request #9672 from PsiOmegaDelta/150604-qdel
Garbage/qdel changes.
2015-06-05 10:36:23 +03:00
GinjaNinja32
2507a8007b Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head 2015-06-05 01:10:15 +01:00
GinjaNinja32
e44a4805f2 Merge pull request #9663 from PsiOmegaDelta/150604-StackFixes
Stack splitting and cable merging fixes.
2015-06-04 23:19:08 +01:00
Karolis2011
9ff27dc038 Now when welding sorting pipe, game update it's name 2015-06-04 20:48:57 +03:00
PsiOmegaDelta
224cbb41bf Garbage/qdel changes.
Moves atom/Destroy() into atom/movable/Destroy(). Is now a /tg/ copy-paste.
Means deleting turfs no longer wipes everything on that turf and that pulling is canceled.
qdel no longer willingly accepts lists.
2015-06-04 19:32:05 +02:00
Dennok
05b4c97e1a fix #9666
up
2015-06-04 18:46:27 +03:00