 Ghom
|
b96475d5aa
|
Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15
/carbons now null out hand_bodyparts on Destroy()
|
2020-03-08 01:40:43 +01:00 |
|
|
CitadelStationBot
|
a3cc805d13
|
Automatic changelog generation for PR #11366 [ci skip]
|
2020-03-07 18:40:24 -06:00 |
|
|
Ghom
|
201a85464c
|
Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle
kilo shuttle less eyesorey
|
2020-03-08 01:40:22 +01:00 |
|
|
CitadelStationBot
|
788660c822
|
Automatic changelog generation for PR #11353 [ci skip]
|
2020-03-07 18:40:09 -06:00 |
|
|
Ghom
|
1e0ea6facf
|
Merge pull request #11353 from Citadel-Station-13/kevinz000-patch-22
Rebalances nanite adrenals
|
2020-03-08 01:40:07 +01:00 |
|
|
CitadelStationBot
|
8012eebfb8
|
Automatic changelog generation for PR #11360 [ci skip]
|
2020-03-07 18:39:55 -06:00 |
|
|
Ghom
|
3e9b998866
|
Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23
Stunbaton disarm mode also works on disarm intent now
|
2020-03-08 01:39:53 +01:00 |
|
|
CitadelStationBot
|
be8331eeb4
|
Automatic changelog generation for PR #11363 [ci skip]
|
2020-03-07 18:39:43 -06:00 |
|
|
Ghom
|
64215b41a4
|
Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground
Culls irrelevant targeting information on Drink Fling.
|
2020-03-08 01:39:41 +01:00 |
|
|
Ghom
|
40fd1deeeb
|
Merge pull request #11364 from kevinz000/gc_debugging
Fixes more xenobio GC memes
|
2020-03-08 01:16:41 +01:00 |
|
|
Lin
|
1a36d6e6fa
|
Merge pull request #10770 from Ghommie/Ghommie-cit536
Removes an unused file and another outdated one.
|
2020-03-07 17:59:12 -06:00 |
|
|
CitadelStationBot
|
81f2963a0d
|
Automatic changelog generation for PR #11356 [ci skip]
|
2020-03-07 17:50:56 -06:00 |
|
|
Lin
|
3dfd7a5ea4
|
Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19
Nerfs ninja stungloves to match new batons
|
2020-03-07 17:50:54 -06:00 |
|
|
kevinz000
|
7115c96f9d
|
Merge branch 'master' into gc_debugging
|
2020-03-07 15:30:47 -08:00 |
|
|
CitadelStationBot
|
c9cad7a0ff
|
Automatic changelog generation for PR #11193 [ci skip]
|
2020-03-07 04:39:53 -06:00 |
|
|
Ghom
|
f35dfeb472
|
Merge pull request #11193 from Trilbyspaceclone/patch-293
Makes two new legion drops
|
2020-03-07 11:39:51 +01:00 |
|
|
CitadelStationBot
|
02a32dc2bd
|
Automatic changelog generation for PR #11339 [ci skip]
|
2020-03-07 04:39:02 -06:00 |
|
|
Ghom
|
6422b15430
|
Merge pull request #11339 from MrJWhit/teg-fix-so-fract-doesn't-yell
TEG fix so fract doesn't yell at me
|
2020-03-07 11:38:59 +01:00 |
|
|
Ghom
|
5fecf00621
|
Merge pull request #11361 from Ragolution/just-slide-on-in
Fixes bartender drink slide spill A
|
2020-03-07 11:37:41 +01:00 |
|
|
Ghom
|
213086ae9f
|
Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12
VV now internally always uses \ref instead of REF()
|
2020-03-07 11:37:17 +01:00 |
|
|
Ghom
|
aed0efb117
|
Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
|
2020-03-07 11:36:37 +01:00 |
|
|
Ghom
|
fdf3dc82e4
|
Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17
Makes xenobiology powergamers slightly less horrible for the server by caching slime mutation lists
|
2020-03-07 11:36:06 +01:00 |
|
|
CitadelStationBot
|
dce540b4cf
|
Automatic changelog generation for PR #11359 [ci skip]
|
2020-03-07 04:35:41 -06:00 |
|
|
Ghom
|
865e859141
|
Merge pull request #11359 from Trilbyspaceclone/lightswitch
Corrects snowcones
|
2020-03-07 11:35:39 +01:00 |
|
|
CitadelStationBot
|
1b926905fb
|
Automatic changelog generation for PR #11338 [ci skip]
|
2020-03-07 04:27:00 -06:00 |
|
|
kevinz000
|
5a18cac701
|
Merge pull request #11338 from Crystal9156/patch-1
Fixes Chocolate Jelly Donuts
|
2020-03-07 03:26:57 -07:00 |
|
|
CitadelStationBot
|
cab5747acf
|
Automatic changelog generation for PR #11340 [ci skip]
|
2020-03-07 04:26:51 -06:00 |
|
|
kevinz000
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
|
CitadelStationBot
|
f58955b80a
|
Automatic changelog generation for PR #11358 [ci skip]
|
2020-03-07 04:24:32 -06:00 |
|
|
kevinz000
|
7de59975fc
|
Merge pull request #11358 from bunny232/master
Box bar lightswitch/pipe fixes now with mapmerge
|
2020-03-07 03:24:29 -07:00 |
|
|
kevinz000
|
204311abad
|
Update code/modules/mob/living/living.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 01:06:24 -07:00 |
|
|
Ragolution
|
9d1cef2e97
|
Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.2
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 01:58:17 -05:00 |
|
|
Ragolution
|
860d6b0827
|
Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.1
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 01:58:06 -05:00 |
|
|
CitadelStationBot
|
4dfa3ec3cf
|
Automatic changelog generation for PR #11367 [ci skip]
|
2020-03-06 17:15:16 -06:00 |
|
|
Ghom
|
0e8d1041a4
|
Merge pull request #11367 from Trilbyspaceclone/patch-303
Corrects arrow crafting
|
2020-03-07 00:15:13 +01:00 |
|
|
Trilbyspaceclone
|
c2e56f156f
|
Update recipes_weapon_and_ammo.dm
|
2020-03-06 17:18:10 -05:00 |
|
|
Trilbyspaceclone
|
3e5809ae30
|
Update code/modules/food_and_drinks/food/snacks_frozen.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-06 16:32:11 -05:00 |
|
|
Ghom
|
bc981bd637
|
Update hivelord.dm
|
2020-03-06 21:55:43 +01:00 |
|
|
ZeroMan
|
96bd80ac54
|
map merge also exists
|
2020-03-06 15:52:33 -05:00 |
|
|
ZeroMan
|
e4c871a8d3
|
eva is maybe dangerous
|
2020-03-06 15:52:12 -05:00 |
|
|
CitadelStationBot
|
928c389b17
|
Automatic changelog generation for PR #11336 [ci skip]
|
2020-03-06 14:47:17 -06:00 |
|
|
Ghom
|
65b7833738
|
Merge pull request #11336 from Putnam3145/mkultra-aaa
Makes MKUltra's explosion no longer spread prefbreak gas
|
2020-03-06 21:47:14 +01:00 |
|
|
ZeroMan
|
ef42a8c2f7
|
map merge also exists
|
2020-03-06 15:14:18 -05:00 |
|
|
ZeroMan
|
bee1f7cfe5
|
its time to vibe
|
2020-03-06 15:13:23 -05:00 |
|
|
kevinz000
|
a669e87db1
|
Merge branch 'master' into gc_debugging
|
2020-03-06 10:14:19 -07:00 |
|
|
kevinz000
|
93d995eb18
|
k
|
2020-03-06 10:13:11 -07:00 |
|
|
Ragolution
|
1cc7d01a44
|
Culls irrelevant targeting information.
|
2020-03-06 11:39:27 -05:00 |
|
|
Ragolution
|
4857bd120c
|
Fixes bartender drink slide spill
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
|
2020-03-06 10:06:59 -05:00 |
|
|
bunny232
|
8f563797df
|
Update BoxStation.dmm
|
2020-03-06 09:28:37 -05:00 |
|
|
CitadelStationBot
|
65b9fd8f70
|
Automatic changelog generation for PR #11298 [ci skip]
|
2020-03-06 08:23:33 -06:00 |
|