MMMiracles
c2bba8d2ff
probably fine
2016-01-01 15:24:02 -05:00
MMMiracles
2be090aee1
Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard
2016-01-01 15:03:45 -05:00
tkdrg
e28576b1ce
Merge pull request #14207 from KorPhaeron/spike
...
Meat spiking someone removes the grab from your hand
2016-01-01 16:32:56 -03:00
tkdrg
471f39aeb2
Merge pull request #14200 from Anonus/spacecarp
...
Spacecarp are now immune to atmos pushing
2016-01-01 16:32:13 -03:00
tkdrg
0d0210c951
Merge pull request #14197 from KorPhaeron/snowdin
...
Allows ghost spawners to implant the new mob
2016-01-01 16:31:53 -03:00
tkdrg
2e35147972
Merge pull request #14199 from KorPhaeron/away
...
Fixes the away mission loader always choosing the same map
2016-01-01 16:31:21 -03:00
Cheridan
9eef40c33f
Merge pull request #14190 from tkdrg/lmao
...
Fixes create revolutionares bugs
2016-01-01 00:46:02 -06:00
Cheridan
92ba9dd695
Merge pull request #14147 from tkdrg/steelth
...
Stealthmin Improvements
2015-12-31 22:24:03 -06:00
tkdrg
083a98dfb1
Merge pull request #14187 from MrStonedOne/patch-109
...
Long actions (like resisting out of handcuffs) will no longer count space drifting as moving.
2016-01-01 00:58:52 -03:00
tkdrg
e5941a59a2
Merge pull request #14124 from KorPhaeron/darkness
...
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
tkdrg
048480decc
Merge pull request #14096 from KorPhaeron/lancer
...
Fixes successive generations of grey tide clones not despawning
2016-01-01 00:50:42 -03:00
tkdrg
8c21c8561c
Merge pull request #14185 from KorPhaeron/revert-14123-multiverse
...
Revert "Multiverse clones are now identical to the summoner"
2016-01-01 00:47:53 -03:00
KorPhaeron
b9bf6ef547
Advanced Darkness
2015-12-31 19:32:02 -06:00
tkdrg
8b4ce26d12
Merge pull request #14182 from Incoming5643/Men_in_tights
...
Removes gender restrictions from socks
2015-12-31 22:09:35 -03:00
Cheridan
cb27e966eb
Merge pull request #14144 from TheRealGLH/electric_chair
...
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
KorPhaeron
2b129fb2ea
Multiply chance down
2015-12-31 18:55:31 -06:00
tkdrg
3d1e20f9b1
Merge pull request #14180 from KorPhaeron/challenge
...
Using challenge ops delays shuttle refuel
2015-12-31 21:54:23 -03:00
KorPhaeron
2c7d5ef326
Proper delay
2015-12-31 18:48:41 -06:00
Tkdrg
0b40fe620f
Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD
...
Closes #14225
2015-12-31 21:37:12 -03:00
Akke
6f47f9b5ee
fixes items spawning in nullspace
2016-01-01 00:34:57 +00:00
tkdrg
b8ce135a34
Merge pull request #14178 from bgobandit/bucklingmessages
...
Fixes extra messages while grabbing someone who is buckled.
2015-12-31 21:28:51 -03:00
duncathan salt
397025b292
Merge pull request #14074 from MrStonedOne/HOLYFUCKINGGHOSTPOPUPS
...
[ready]Ghost popup re-work
2015-12-31 23:58:03 +01:00
MrStonedOne
3ebc6749af
Brings shade selection into the pollCanidates system
2015-12-31 14:15:49 -08:00
tkdrg
82c53c4474
Merge pull request #14171 from AnturK/bang
...
Simple mob fixes
2015-12-31 18:40:42 -03:00
Tkdrg
70ba1a24f5
Merge branch 'AnturK-manifesto' into HEAD
...
Closes #14173
2015-12-31 18:35:10 -03:00
tkdrg
12fe71606f
Merge pull request #14155 from optimumtact/patch-4
...
Add cockroach guts to cleanbot target list
2015-12-31 17:42:23 -03:00
tkdrg
28ca4ec1be
Merge pull request #14167 from okaw/newshoes
...
Changing bartender security icon + shoes to laceups
2015-12-31 16:14:15 -03:00
tkdrg
153304ddc8
Merge pull request #14165 from SouDescolado/SouDescolado-patch-1
...
Stacks the papers inside a folder inside briefcase
2015-12-31 16:07:24 -03:00
KorPhaeron
7fd33d23a5
Meat spike
2015-12-31 12:50:05 -06:00
tkdrg
f64392a8cd
Merge pull request #14166 from KorPhaeron/ghosts
...
Fixes offer control to ghosts not working on mindless mobs
2015-12-31 15:07:58 -03:00
KorPhaeron
efc4df456e
Poor indent
2015-12-31 11:37:51 -06:00
Nerd Lord
8996b7c71e
Strong independent carp that don't get pushed around.
2015-12-31 12:31:28 -05:00
KorPhaeron
9c8a0cb0a5
Implant
2015-12-31 10:47:33 -06:00
MrStonedOne
ba660d98ba
Some minor ghost popup fixes
2015-12-31 02:23:53 -08:00
MrStonedOne
69a70daebd
Ghost popup part 2: The didn't do much-a-ning
...
Fixes button3, does the remie
2015-12-31 01:54:15 -08:00
Tkdrg
3b1553cb8c
Fixes create revolutionares bugs
...
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1
Fixes #14189
Fixes #14161
2015-12-31 04:19:32 -03:00
tkdrg
ff57d7e485
Merge pull request #14163 from swankcookie/Holopad_Layer_Fix
...
Holopad layer fix
2015-12-31 03:41:55 -03:00
tkdrg
52a45b6292
Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
...
OBJECTIVES REWORK: Better Objectives Generation
2015-12-31 03:11:41 -03:00
Nerd Lord
071cb63930
fine okay no helper
2015-12-30 23:32:58 -05:00
Nerd Lord
96f1ec92b0
ACTION CONFLICTING
2015-12-30 23:14:32 -05:00
Kyle Spier-Swenson
167324d5dc
Forgot to remove a tab when I combined nested ifs
2015-12-30 20:05:57 -08:00
Kyle Spier-Swenson
6ec763e655
forgot a )
2015-12-30 19:59:18 -08:00
Kyle Spier-Swenson
f859536aa9
do_after and company will no longer break on spacemove
...
So I was looking into atom/movable/Move() being high up on the profile when I stumbled upon inertia_dir and had ideas.
Everything is SUPPOSE to set this to 0 when they stop space moving. I'm just gonna trust that to be the case (it is in base atom/movable/newtonian_move.
I don't want to keep calling Process_Spacemove in the loop because that feels dirty.
2015-12-30 19:55:27 -08:00
tkdrg
da97c0fb58
Merge pull request #14107 from LanCartwright/newvirogrenades
...
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
tkdrg
4485cc3dfb
Merge pull request #14146 from KorPhaeron/guns
...
Lesser Summon Guns
2015-12-30 23:32:13 -03:00
tkdrg
50f6b7b8c0
Merge pull request #14154 from KorPhaeron/telsa
...
Removes excess tesla balls from orbit list
2015-12-30 23:27:58 -03:00
tkdrg
b381ff2b31
Merge pull request #14132 from KorPhaeron/pda_spaces
...
Fixes PDA formatting
2015-12-30 23:27:28 -03:00
LanCartwright
f9aa12d190
excludes virus kits from nuke
2015-12-31 02:22:51 +00:00
LanCartwright
023f606406
Update uplink_item.dm
2015-12-31 02:20:35 +00:00
LanCartwright
02dc51db6f
Update uplink_kits.dm
2015-12-31 02:17:30 +00:00
