shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,972 Commits 5 Branches 0 Tags
d6b1b7603761a2b6e3abb4b253fb6494de2dde0d
Commit Graph

11097 Commits

Author SHA1 Message Date
Artur
90113838a7 Iconfix and co 
Traits instead of procs for fakedeath

Quickfix

Whoops this too

Loadsa fixes

Nerfs stamina regen

Too slow

Hm
 2019-12-02 19:48:02 +02:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145
8da17c5aaf Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117 
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
 2019-12-01 23:12:35 -08:00
Putnam3145
7bb2b042ee Merge pull request #9989 from Ghommie/Ghommie-cit410 
Ports the energy gun empty state overlay fix.
 2019-12-01 23:06:40 -08:00
Linzolle
f4318c9dba bleeding indicator for more than jsut heparin 2019-12-01 18:10:48 -06:00
Putnam3145
4942002698 Merge pull request #10022 from Sishen1542/n 
techfabs are now easier to investigate
 2019-12-01 13:44:00 -08:00
Linzolle
efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Seris02
cebf2d2de2 does putnam's suggestion 
I edited this on a web browser so if it breaks blame putnam
 2019-12-02 00:30:20 +08:00
Sishen
3ccc88e2b9 Update meteor_wave.dm 2019-12-01 05:15:41 -07:00
Sishen
a4323b2e4e Update _production.dm 2019-12-01 05:10:30 -07:00
Sishen
3ac863d0ac Revert "n" 
This reverts commit 975a1a968c.
 2019-12-01 05:09:34 -07:00
Sishen
975a1a968c n 2019-12-01 05:03:18 -07:00
Artur
f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Winter Flare
89aa08837f Updated Access, Bluespace Trash (again). Fixes 
Updated Engineering and Medical hardsuits to require access for their applicable departments.

Moved Virus Containment into it's proper file.

Put Bluespace Trashbag back in the advanced sanitation crate.

Spellcheck.
 2019-12-01 05:12:14 -05:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes 
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
 2019-11-30 22:51:42 -08:00
Lin
0f721cbfca Merge pull request #10017 from Putnam3145/volume-filter 
Makes filters volume-based
 2019-12-01 06:47:16 +00:00
Putnam3145
e1a9c8e6d3 Merge pull request #9972 from Ghommie/Ghommie-cit403 
Fixed double whitespace gap in human, ai and carbon examine.
 2019-11-30 22:46:29 -08:00
Putnam3145
aaf9f12e11 Merge pull request #9981 from Ghommie/Ghommie-cit407 
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
 2019-11-30 22:44:06 -08:00
Putnam3145
a196e3f45b Merge pull request #9977 from Useroth/new-tg-plants 
[FIX] Another patch for the recently added tg plants.
 2019-11-30 22:23:41 -08:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL 
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
 2019-11-30 22:22:52 -08:00
Artur
9b20879ba5 Ditto 2019-12-01 00:07:07 +02:00
Seris02
b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00
Winter Flare
66114f9c37 Removed Power Tools, Tweaked EF Crate 
Removed Power Tool Crate

Made exotic footwear non-contraband, and increased price.
 2019-11-30 00:49:14 -05:00
Putnam
1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
deathride58
6b3f992d8e fixes paperbins and papercutters proper 2019-11-29 23:11:27 -05:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Seris02
136698ce7d Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination 2019-11-30 10:26:21 +08:00
Seris02
9788586bb2 fixes some things :hjonk: 2019-11-30 10:23:22 +08:00
Seris02
84c2b7cef6 Update code/modules/flufftext/Hallucination.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-30 10:02:23 +08:00
Putnam
00f7305aa5 holy shit 2019-11-29 17:15:49 -08:00
Artur
a6e6274039 Reviewer fixes and spacing 2019-11-30 01:21:07 +02:00
Winter Flare
a524ca6f18 Spellchecking and Crate balance. 
Integrated #9939 spellchecking.

Rebalanced Emergency Medical Supplies, EMS Lite, and advanced janitorial crate. (Also added to Advanced Janitorial and Power Tools crate that they require access.)
 2019-11-29 16:54:04 -05:00
Artur
02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Linzolle
4863deb978 blood ratio 2019-11-29 12:59:25 -06:00
Seris02
a4fb86df48 forgot to add it to the list of hallucinations you can have 2019-11-30 01:00:23 +08:00
Seris02
1e8227346c adds sleeping carp wrist wrench/violent grab hallucination 2019-11-30 00:50:27 +08:00
Putnam3145
ad53b10faa Merge pull request #9964 from GrayRachnid/fixmyblunder 
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
 2019-11-29 06:20:18 -08:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413 
Fixes tinfoil hats giving random traumas.
 2019-11-29 06:16:36 -08:00
Putnam3145
3b437417b9 Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119 
Nerfs nanite adrenals
 2019-11-29 05:42:49 -08:00
Unknown
233ca30cd6 Merge branch 'master' into xantholne-christmas01 2019-11-28 23:21:36 -07:00
kevinz000
521fdec59b Merge pull request #9960 from Ghommie/Ghommie-cit398 
Ports custom reagent icecreams.
 2019-11-28 23:11:57 -07:00
kevinz000
ace239fe8f Merge pull request #9962 from Ghommie/Ghommie-cit399 
Fixes limbs' set_disabled.
 2019-11-28 23:11:36 -07:00
kevinz000
40179da15e Merge pull request #9965 from GrayRachnid/addfuntothekitchen 
Adds Fun to the Kitchen's stacking skills
 2019-11-28 23:11:24 -07:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400 
Ports elements: Lightweight shared/global components.
 2019-11-28 23:08:32 -07:00
kevinz000
f287af694b Merge pull request #9969 from Linzolle/hat-man-bad 
revert knocking people's hats off
 2019-11-28 23:04:34 -07:00
kevinz000
7495ce602a Merge pull request #9693 from Ghommie/Ghommie-cit310 
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
 2019-11-28 23:03:07 -07:00
Sishen
69e11e4203 olllll 2019-11-28 23:01:15 -07:00
Sishen
3a1e4dec5a Revert "lol" 
This reverts commit 7f6a1a6fda.
 2019-11-28 23:00:13 -07:00
kevinz000
2c19c55fc3 Update nanite_programs.dm 2019-11-28 23:00:09 -07:00