PsiOmegaDelta
4ed1e118fc
Merge pull request #11861 from Baystation12/master
...
Dev-freeze
2016-01-01 13:14:21 +01:00
Chinsky
7ad106349c
Merge pull request #11749 from headswe/soulstone_fix
...
Fixes #11711 & Refractors soulstone.dm
2015-12-31 00:36:14 +03:00
Sebastian Broberg
14393ea706
Few refraction
2015-12-27 17:05:08 +01:00
mwerezak
8b685fdf8f
Fixes #11380
2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea
Fixes #11381
2015-12-27 01:28:41 -05:00
PsiOmegaDelta
da0a4c47cf
Merge pull request #11756 from Baystation12/master
...
Dev-freeze
2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb
Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow
...
Can now join compatible cable coils of any type.
2015-12-26 18:23:43 +10:30
Sebastian Broberg
370529bc42
Refractored soulstone.dm
...
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7
Boop, logic escaped me also refractor this shit someone.
2015-12-25 11:30:33 +01:00
PsiOmegaDelta
faec92b553
Can now join compatible cable coils of any type.
...
Partial backport of #11656 . Fixes #10935 .
2015-12-25 11:19:59 +01:00
GinjaNinja32
7cca8416b3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-12-25 03:41:33 +00:00
GinjaNinja32
04006f5b9e
fix human examine gender
2015-12-25 01:06:35 +00:00
Sebastian Broberg
ebef6272b9
Fixes #11711
...
Should fix it.
2015-12-24 23:02:37 +01:00
Zuhayr
53b2c6be80
Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis
...
Adds a paralyze button for easier administration
2015-12-23 23:28:37 +10:30
PsiOmegaDelta
70b84d87a6
Tweaks permission rights.
2015-12-23 13:01:03 +01:00
Datraen
65f68602e7
Adds a longer timer to paralyze, allows for other mobs to fall under this proc.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:57:43 +01:00
Datraen
c5912b988c
Adds a paralyze button for easy administration.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:56:48 +01:00
PsiOmegaDelta
f54dd94a66
Merge pull request #11735 from Baystation12/master
...
Dev-freeze
2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647
Fixes AI's Examine()
...
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
PsiOmegaDelta
3cf0a0e182
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
ccomp5950
5873a92df8
Fixes the icon for numbness.
...
Resolves #11435
2015-12-21 15:30:26 -05:00
PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
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
Hubblenaut
56d8975a19
Tweaks Filtering and Toxic Gases
2015-12-17 17:50:30 +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
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
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
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
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
PsiOmegaDelta
c4d6a76887
Merge pull request #11649 from Baystation12/master
...
Dev-freeze
2015-12-10 08:21:43 +01:00
Zuhayr
e9cdc8a0f5
Fixes #9257
2015-12-10 11:57:34 +10:30
Zuhayr
7a9d7bf0c9
Fixes #10753
2015-12-10 10:41:48 +10:30
