ccomp5950
ce3587d867
Hallucinations no longer burn on the SuperMatter
2015-12-19 21:33:02 -05:00
PsiOmegaDelta
378f62b81e
AI qdel() improvements.
...
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710 .
2015-12-19 11:45:24 +01:00
Chinsky
9a156c56de
Merge pull request #11513 from Karolis2011/Constructable_Cargo
...
Constructable Cargo
2015-12-19 09:18:45 +03:00
Hubblenaut
28919269ee
Prevents blob from growing over asteroid walls
2015-12-18 07:59:49 +01:00
Zuhayr
740d10d3fc
Fixes colour issues.
2015-12-18 07:58:54 +01:00
ccomp5950
6736fb54e7
Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
Neerti
0e3f37570a
Makes radiation medication not actually irradiate you worse.
2015-12-17 17:56:36 +01:00
Hubblenaut
dce5a70572
Colors on-mob sprites
2015-12-17 17:54:44 +01:00
Hubblenaut
56d8975a19
Tweaks Filtering and Toxic Gases
2015-12-17 17:50:30 +01:00
Zuhayr
64421e35ca
Fixes some overlay issues with aiming.
2015-12-17 17:39:25 +01:00
Jon
d890a4ce30
Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time.
2015-12-17 17:38:34 +01:00
Spamcat
a515f0469a
Wrenched opwn welding tanks now explode when exposed to fire.
...
#11537
2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f62f24e1ac
Removes Stat() sleep.
...
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.
Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
Chinsky
8413d7bd20
Merge pull request #11682 from Zuhayr/guns
...
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Zuhayr
1ab263f662
Rewrote targeting.
2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e
Removed targeting.
2015-12-16 10:09:20 +10:30
PsiOmegaDelta
bbe65baf5c
Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape
...
Conflicts:
code/__defines/misc.dm
2015-12-13 11:50:06 +01:00
PsiOmegaDelta
eda4a5d595
Adds tape to medical, and excavation lockers.
...
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
2015-12-13 11:48:29 +01:00
PsiOmegaDelta
12078c48e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/mobs.dm
code/game/asteroid.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
Chinsky
911498fc32
Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1
...
fix slime core injecting not working
2015-12-13 11:05:16 +03:00
PsiOmegaDelta
9332e39ef9
Merge pull request #11665 from SkyMarshal/monkeying-with-disposals
...
Fixes #11093
2015-12-12 23:32:58 +01:00
GinjaNinja32
972942552e
Merge pull request #11676 from Kearel/mindswapfix
...
Fixes #10550
2015-12-12 22:24:45 +00:00
Joseph Heinemeyer
a5b0f86c19
s/"help"/I_HELP/g
2015-12-12 15:24:13 -07:00
GinjaNinja32
ddf66a5f39
fix slime core injecting not working
2015-12-12 21:56:37 +00:00
PsiOmegaDelta
6f75954863
Merge pull request #11678 from SkyMarshal/newscaster-silliness
...
Admin created newscaster channels now function correctly.
2015-12-12 22:51:48 +01:00
SkyMarshal
f9af885ee1
Admin created newscaster channels now function correctly.
...
Fixes #8326
2015-12-12 14:32:22 -07:00
SkyMarshal
d10118e3d0
Fixes #11346
...
Fixes #8123
Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
Kearel
6c3972f979
Fixes #10550
...
From what I could tell the bugs were caused by the HUD not being removed
and spells not being properly removed from players.
2015-12-12 12:47:08 -06:00
PsiOmegaDelta
fd14a90c34
Merge pull request #11673 from comma/dev-freeze
...
Impulse directions and zombie vomit
2015-12-12 16:38:36 +01:00
Chinsky
36803747a2
Merge pull request #11445 from Kearel/fluff2
...
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
Chinsky
637abb5d12
Fixes #10597
2015-12-12 15:29:10 +03:00
PsiOmegaDelta
a731571d60
Merge pull request #11670 from comma/norandom
...
Fixes #9197
2015-12-12 12:45:13 +01:00
Chinsky
e89eae05bb
Fixes #9197
2015-12-12 14:23:00 +03:00
Chinsky
1927d1744f
Fixes #11667
2015-12-12 13:57:26 +03:00
SkyMarshal
a97da84b18
Fixes #11093
...
Also fixes a runtime error trying to disposal monkeys and the like. It was doing a type check too late.
2015-12-11 21:32:00 -07:00
SkyMarshal
eae12b8f9c
Fixes #8568
2015-12-11 19:52:18 -07:00
SkyMarshal
02d1a875d1
Fixes #7075
...
Disposal holders will now be emptied if they get expelled from a disposal pipe, instead of sitting there hoarding their contents.
2015-12-11 18:26:52 -07:00
Chinsky
39af995c05
Merge pull request #11641 from PsiOmegaDelta/151209-BlobTweak
...
Blob tweaks.
2015-12-12 02:56:43 +03:00
Chinsky
21f8c4aef1
Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow
...
Now possible to change cable coil color using a multitool.
2015-12-12 02:54:49 +03:00
PsiOmegaDelta
a29bbc28c0
Cargo tugs now uses a more finally grained incapacitation check.
2015-12-11 13:48:18 +01:00
Atlantis
ac0e70612f
Fixes #11621
...
- Fixes #11621 by ensuring reference to analyzed object is nulled even if the analyzed object is not reliable enough
- Adds feedback message that warns the user that analyzed item wasn't reliable enough.
2015-12-11 12:15:53 +01:00
PsiOmegaDelta
e0c092fc54
Cleans up the previous commit's use of stacktype.
2015-12-11 11:18:27 +01:00
Hubblenaut
6b37b860d7
Fixes subcategories of cable coils not being mergeable
2015-12-11 11:09:11 +01:00
Datraen
6120e09684
Fixes the inability to use cargo tugs
2015-12-11 11:08:00 +01:00
Kearel
9450680b1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-12-10 13:04:52 -06:00
Karolis2011
1774743f24
Made part of recycling code to use atom.forceMove() and
...
fixed minor bugs:
Delivery chute deconstruction use no fuel.
2015-12-10 19:53:42 +02:00
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
PsiOmegaDelta
5ffa49d994
Blob tweaks.
...
The blob no longer holds the entire obj process hostage while it sleeps.
The blob now respects its own growth limit. Fixes #11627 .
Blobs still grow in an X-shape but this should now be much less distinct.
2015-12-10 13:20:20 +01:00
GinjaNinja32
1979a909d4
Merge pull request #11651 from Zuhayr/dev
...
Forensics fixes/tweaks.
2015-12-10 10:44:01 +00:00
