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
|
471f39aeb2
|
Merge pull request #14200 from Anonus/spacecarp
Spacecarp are now immune to atmos pushing
|
2016-01-01 16:32:13 -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
|
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
|
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 |
|
tkdrg
|
82c53c4474
|
Merge pull request #14171 from AnturK/bang
Simple mob fixes
|
2015-12-31 18:40:42 -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 |
|
Nerd Lord
|
8996b7c71e
|
Strong independent carp that don't get pushed around.
|
2015-12-31 12:31:28 -05:00 |
|
Incoming
|
84fc69d825
|
Removes gender restrictions from socks.
|
2015-12-30 20:53:40 -05:00 |
|
bgobandit
|
470fcbc58f
|
Fixes messages for grabbing someone who is buckled in.
|
2015-12-30 19:17:51 -05:00 |
|
AnturK
|
b875ab18cf
|
Makes simple mob drift properly
|
2015-12-30 22:31:51 +01:00 |
|
AnturK
|
06946ca53c
|
Adds timeout to player hivelord brood spawning.
|
2015-12-30 21:46:54 +01:00 |
|
Razharas
|
fd0738aff8
|
Merge pull request #14125 from KorPhaeron/gold_grub
Gold grub fix
|
2015-12-30 00:38:06 +03:00 |
|
oranges
|
06338ecd3d
|
Add cockroach guts to cleanbot target list
whitelists are such a meme
|
2015-12-30 08:58:27 +13:00 |
|
tkdrg
|
5930ee0d66
|
Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
|
2015-12-29 14:26:48 -03:00 |
|
Lo6a4evskiy
|
ab6fb1ab36
|
Refactor using slot_equipment_priority
|
2015-12-29 17:59:56 +04:00 |
|
TheRealGLH
|
d7097594ff
|
removes the burn_skin proc
removes the burn_skin proc
|
2015-12-29 13:48:38 +01:00 |
|
Remie Richards
|
ae2ef83fc6
|
Merge pull request #14062 from tkdrg/jesusFUCK
[s]Fixes secbot construction dupe
|
2015-12-29 07:06:19 +00:00 |
|
KorPhaeron
|
afdf68858d
|
gold_grub
|
2015-12-28 15:48:38 -06:00 |
|
duncathan salt
|
b943109a02
|
Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
|
2015-12-28 22:06:31 +01:00 |
|
tkdrg
|
e88bf4e2b5
|
Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
|
2015-12-28 14:35:34 -03:00 |
|
tkdrg
|
1dec16cbb9
|
Merge pull request #13936 from Shadowlight213/AdminAIToggle2
Makes Admin AI interaction a logged toggle. Take 2
|
2015-12-27 22:01:01 -03:00 |
|
KorPhaeron
|
9e053da327
|
Fixes greytide
|
2015-12-27 12:25:47 -06:00 |
|
tkdrg
|
50bcb521f5
|
Merge pull request #14056 from neersighted/nano_tweaks
Nano Tweaks
|
2015-12-27 14:20:52 -03:00 |
|
Bjorn Neergaard
|
a173cc01f6
|
Fix NanoUIs not transfering when the owner ghosts (or reenters)
|
2015-12-27 10:56:48 -06:00 |
|
MrStonedOne
|
5f68bedcd1
|
Upgrades do_after and progress bars
|
2015-12-26 21:04:19 -08:00 |
|
Tkdrg
|
152f66d918
|
Fixes secbot construction dupe
Removes one of the copy-pasted attackby()s.
Fixes #13527
|
2015-12-26 11:49:29 -03:00 |
|
phil235
|
68ab5f72ee
|
Merge pull request #14061 from tkdrg/fuckme
Fixes indentation in cockroach death()
|
2015-12-26 14:54:30 +01:00 |
|
tkdrg
|
c64430a0fd
|
Merge pull request #13996 from AnturK/fixfixfix
Minor fixes
|
2015-12-26 10:23:21 -03:00 |
|
tkdrg
|
b689055016
|
Merge pull request #13986 from KorPhaeron/illusion
Fixes illusions running about on their face
|
2015-12-26 10:16:45 -03:00 |
|
KorPhaeron
|
bcdc028c3b
|
Initial transform
|
2015-12-26 07:06:57 -06:00 |
|
Tkdrg
|
42cd502626
|
Fixes indentation in cockroach death()
Thanks @phil235 !
|
2015-12-26 09:33:56 -03:00 |
|
tkdrg
|
d4cc57041b
|
Merge pull request #14029 from PKPenguin321/patch-6
Fixes some EZ issues
|
2015-12-26 04:42:51 -03:00 |
|
tkdrg
|
6314572c46
|
Merge pull request #13991 from Jordie0608/thepinatateacheskidsvitalessonsabouthowviolenceisrewarding
Generalises simple animal loot drops and removes copypasta
|
2015-12-26 04:34:27 -03:00 |
|
Jordie
|
0ee6c6acd0
|
readds layer hack for mining mob loot
|
2015-12-26 15:50:54 +11:00 |
|
tkdrg
|
0a4b99e2ec
|
Merge pull request #13985 from bgobandit/bugfixesandshit
Fixes some minor bugs and adds minor feedback.
|
2015-12-25 18:24:25 -03:00 |
|
tkdrg
|
1180d1f007
|
Merge pull request #13987 from KorPhaeron/mekhi
[s]Fixes being able to trigger your own reactive armour with thrown objects
|
2015-12-25 15:06:30 -03:00 |
|
tkdrg
|
b8767bea04
|
Merge pull request #14003 from KorPhaeron/stand_names
Fixes guardians/parasites always being named "Guardian Spirit" after they die
|
2015-12-25 14:14:56 -03:00 |
|
tkdrg
|
20e6285c85
|
Merge pull request #13989 from KorPhaeron/spider_fixes
Spider fixes
|
2015-12-25 14:11:51 -03:00 |
|
PKPenguin321
|
93aa422c2a
|
fixes statue.dm
anotha one
|
2015-12-24 19:33:50 -08:00 |
|
tkdrg
|
d0ac4427c2
|
Merge pull request #13861 from Incoming5643/once_again_kors_fix_to_a_wizard_mechanic_has_forced_my_hand
Objects created by the staff of animation eventually revert if there's no one to attack
|
2015-12-25 00:14:42 -03:00 |
|
tkdrg
|
e3fbe54fb2
|
Merge pull request #13957 from Incoming5643/what_do_you_mean_its_a_metaphor
Bonus drops from killing beepsky
|
2015-12-25 00:03:25 -03:00 |
|
Incoming5643
|
76b59e1d4c
|
does the mso
|
2015-12-24 21:22:18 -05:00 |
|
Incoming
|
8e9e6891d3
|
Makes the shot of whiskey actually a shot glass since some people wanted it and it's an easier problem to solve.
|
2015-12-24 21:18:19 -05:00 |
|
tkdrg
|
dae30404ae
|
Merge pull request #13958 from MrStonedOne/patch-99
no grav movement now uses !can_pass as well as density
|
2015-12-24 14:49:37 -03:00 |
|
KorPhaeron
|
4145dc16c9
|
Stand Names
|
2015-12-24 08:09:14 -06:00 |
|
duncathan salt
|
ede1cdb511
|
Merge pull request #13960 from AnturK/nuclearoption
Random fixes
|
2015-12-24 14:12:24 +01:00 |
|