shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,431 Commits 5 Branches 0 Tags
fdf3dc82e4d245bf620cf651bb86a79b8cea5593
Commit Graph

13294 Commits

Author SHA1 Message Date
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
Ghom
865e859141 Merge pull request #11359 from Trilbyspaceclone/lightswitch 
Corrects snowcones
 2020-03-07 11:35:39 +01:00
kevinz000
5a18cac701 Merge pull request #11338 from Crystal9156/patch-1 
Fixes Chocolate Jelly Donuts
 2020-03-07 03:26:57 -07:00
kevinz000
02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 
Porting movespeed modifiers code updates.
 2020-03-07 03:26:48 -07: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
c6c676ceb5 Merge pull request #11298 from Kraseo/contracties 
Ports TG's Syndicate Contractors
 2020-03-06 15:23:30 +01:00
TrilbySpaceClone
f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
Ragolution
597e1210f3 fix quintuple sec mix_sound def 
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
 2020-03-06 08:38:33 -05:00
Ghom
4b3725bb43 Merge pull request #11348 from Citadel-Station-13/kevinz000-patch-19 
fixes pool mist garbage collection
 2020-03-06 14:20:58 +01:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000
3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000
62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000
ae97cec8b4 Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1 
The lavaland elite tumor shard revival now fetches the mob's ghost.
 2020-03-06 00:20:18 -07:00
kevinz000
d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
 2020-03-06 00:19:51 -07:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
kevinz000
23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302 
Makes medical hardsuits have built in huds
 2020-03-06 00:17:09 -07:00
kevinz000
78b1dcaae4 Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4 
Allows blobbernauts to drag objects (but not mobs) again.
 2020-03-06 00:14:43 -07:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603 
Replaces EXCEPTION() with stack_trace() and CRASH()
 2020-03-06 00:14:13 -07:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
Crystal9156
adc965d55e Fixes Chocolate Jelly Donuts 
Choco Jelly Donuts's icon_state is actually jelly_choco, it /was/ jelly_choc which is incorrect as the dmi says jelly_choco
 2020-03-05 20:52:09 -05:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
Ghom
44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens! 
Removed unused techweb var - Cargo selling of Techwebs nodes
 2020-03-06 01:21:09 +01:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
Ghom
68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading 
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
 2020-03-05 00:26:12 +01:00
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy 
changes sausage girth from circumference -> diameter
 2020-03-04 23:49:58 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1 
fix nose booping
 2020-03-04 23:40:54 +01:00
Ghom
9eedf8c1fb Update blob_mobs.dm 2020-03-04 23:34:59 +01:00
Ghom
ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix 
Fixes reagent containers transfer cycling
 2020-03-04 23:17:00 +01:00
Ghom
17488480b1 Allows blobbernauts to drag objects (but not mobs) again. 2020-03-04 22:43:30 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00
Artur
f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
Lin
1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2 
Fixing mob holders inventory slot flags (ergo they are not glasses)
 2020-03-04 13:29:13 -06:00
Trilbyspaceclone
1c310f6cee Update hardsuit.dm 2020-03-04 13:01:25 -05:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
Ghommie
60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Kraseo
edfe50579e ACTUALLY fixes null runtimes + double contracts 2020-03-04 13:17:24 +01:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000
7291417244 fix 2020-03-03 20:57:03 -07:00
kevinz000
f8187d0fbf optimize move under living 2020-03-03 20:51:50 -07:00
kevinz000
334f1cc1cf linzolle 2020-03-03 20:48:39 -07:00