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

20113 Commits

Author SHA1 Message Date
KathrinBailey
86790c69a5 credits accidently left out previously 
re-adds nod to CEV Eris for their original sprites.
 2020-03-03 14:38:16 +00:00
KathrinBailey
7e0abda3c1 fixing merge conflicts 
includes trillby's new posters.
 2020-03-03 13:56:01 +00:00
KathrinBailey
83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture 2020-03-03 13:48:18 +00:00
KathrinBailey
fe7742637f fixing merge conflicts aaahh 2020-03-03 13:47:58 +00:00
KathrinBailey
a240daaca2 Final changes 
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
 2020-03-03 13:19:15 +00:00
Ghom
107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23 
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
 2020-03-03 13:36:52 +01:00
Ghom
f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster 
Three new posters!
 2020-03-03 13:29:54 +01:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf 
Rising bass nerfs and fixes
 2020-03-03 13:26:19 +01:00
Ghom
6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1 
fix flypeople nutrition
 2020-03-03 13:24:32 +01:00
Ghom
294668d6e1 Merge pull request #11300 from kappa-sama/patch-11 
removes obsolete laptop slowdown
 2020-03-03 13:24:15 +01:00
Ghom
c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19 
*HELPS* with the atrocious GC situation regarding blobs
 2020-03-03 13:23:28 +01:00
Ghom
3a80d59330 Merge pull request #11312 from Citadel-Station-13/kevinz000-patch-24 
Fixes a bug with garbage collection
 2020-03-03 13:23:12 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000
81f84f1bd1 Update garbage.dm 2020-03-02 18:18:44 -07:00
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596 
An old oversight with disease/var/viable_mobtypes.
 2020-03-02 18:31:25 -06:00
Ghom
c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks 
Paramedic tweaks (sprites/access/stuff for future use)
 2020-03-02 22:46:49 +01:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap 
Proper supermatter tweaks
 2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19 
Pushing stuff now checks for Process_Spacemove on the automatic step
 2020-03-02 16:34:18 +01:00
Ghom
4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299 
Makes most winter coats and hoods have their own desc
 2020-03-02 16:18:47 +01:00
Ghom
fca911b74f Merge pull request #11281 from Ragolution/master 
Just another round-end sound.
 2020-03-02 16:17:37 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000
92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
Lin
bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghom
28c2d27860 Merge pull request #11287 from monster860/patch-1 
Allow moaning while in soft crit
 2020-03-02 00:13:27 +01:00
Putnam
aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d Actually.. 2020-03-01 16:02:58 +01:00
Ghommie
893cca97a3 An old oversight with disease/var/viable_mobtypes. 2020-03-01 15:59:42 +01:00
Arturlang
97c5aa1e24 Maintainer suggestions 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-01 16:48:49 +02:00
kevinz000
9a3ddaaf7b Update logging.dm 2020-03-01 07:08:04 -07:00
KathrinBailey
d817442f02 It works! 
Everything works now.
 2020-03-01 13:42:14 +00:00
Ghom
20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp 
ongoing vampire ability balance/rework attempt
 2020-03-01 14:39:03 +01:00
Ghom
3ec80872f0 Merge pull request #11279 from Hatterhat/tg-45232-lavariver 
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
 2020-03-01 13:55:03 +01:00
KathrinBailey
72d3572ec3 New sofas added, need to be added to sheet_types.dm still 
Backing up the .dmi changes and two comfy chairs.
 2020-03-01 11:58:59 +00:00
Trilbyspaceclone
12ea1132c4 Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-01 00:43:34 -05:00
raspyosu
d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
Trilbyspaceclone
cdd97e8547 she 2020-03-01 00:12:45 -05:00
Trilbyspaceclone
e2b706961a Turns out this is Rag's PR and not mine 
Neet

Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
 2020-03-01 00:11:32 -05:00
monster860
899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
Ghom
609dc0e792 Merge pull request #11242 from Kraseo/green-thumb 
Adds reagent traits to Lavaland flora + a botany QOL change
 2020-02-29 23:03:53 +01:00
Ghom
eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug 
adds and improves some gc debugging stuff
 2020-02-29 22:53:58 +01:00
Ghom
295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter 
Gave jittering to salbutamol
 2020-02-29 20:42:03 +01:00
Trilbyspaceclone
3c9d592b8a Update miscellaneous.dm 2020-02-29 09:51:40 -05:00
ancientpower
f44908dc2e forgot icon state changes 2020-02-29 02:03:25 -06:00