shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,607 Commits 5 Branches 0 Tags
e1ad3ececa3511e347ae8ea40be45dae2241dbdd
Commit Graph

14765 Commits

Author SHA1 Message Date
Sishen
5159a58fef Update strained_muscles.dm 2019-09-14 12:00:28 -04:00
Trilbyspaceclone
5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy 
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
 2019-09-13 10:47:15 -07:00
kevinz000
e107c51e19 Merge pull request #9241 from Linzolle/oracleui 
Ports Oracle UI framework, and updates UI for paper and disposal bins.
 2019-09-13 10:46:11 -07:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192 
Fixing undergarments color preferences resetting each round.
 2019-09-13 10:43:43 -07:00
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
 2019-09-13 10:43:22 -07:00
kevinz000
c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen 
Adds clip on pokadoted pants, only in 4 types for now
 2019-09-13 10:43:00 -07:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
kevinz000
4494f42155 Merge pull request #9270 from Linzolle/reallyguys 
fixes donuts being uncraftable
 2019-09-13 10:40:21 -07:00
Linzolle
213bd2fc6b fixes 2019-09-12 23:35:21 -05:00
kevinz000
39b840b180 Merge pull request #9278 from deathride58/fuckkeydown 
[s] ports tgstation/tgstation#46425
 2019-09-12 12:10:01 -07:00
BlackMajor
7e7527dcfe Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY 
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
 2019-09-12 18:37:56 +12:00
Ghommie
025b6122d4 short colors 2019-09-12 02:58:34 +02:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Fermi
6b76b09449 Missed 2 2019-09-11 23:30:56 +01:00
TrilbySpaceClone
fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Fermi
c79c4aafa5 Cleans up var/test into targetReagent 2019-09-11 18:51:05 +01:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
Fermi
d59196f430 oops 2019-09-11 16:38:55 +01:00
Linzolle
daba09582a move to misc.dm 2019-09-11 10:18:10 -05:00
kevinz000
f4bff19592 Merge pull request #9260 from dapnee/trim-decals 
Ports trim decals
 2019-09-11 03:26:47 -07:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2019-09-10 22:06:36 -07:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo 
No ID insertion for everything except the hop console
 2019-09-10 22:04:48 -07:00
kevinz000
829a2615c5 Merge pull request #9247 from Thalpy/QuantFix 
Partially fixes tiny runaway decimals in reagents.
 2019-09-10 10:27:40 -07:00
BlackMajor
0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
Linzolle
6cc92da914 bruh 2019-09-09 18:02:23 -05:00
BlackMajor
c824f4a6fe Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross 2019-09-09 20:38:51 +12:00
nik707
11846849cf Merge pull request #9249 from Trilbyspaceclone/patch-224 
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
 2019-09-08 19:49:44 -04:00
nik707
bfbf9f2492 Merge pull request #9254 from Citadel-Station-13/gloria-plushie 
Adds Gloria Redwood plushie as well as heichou's plushies.
 2019-09-08 19:47:50 -04:00
kevinz000
7843e070ff Update mob.dm 2019-09-08 12:13:24 -07:00
Dap
9f275ebf01 Ports trim decals 
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
 2019-09-08 10:51:05 -06:00
kevinz000
3e9d37e70d Update plushes.dm 2019-09-07 17:13:21 -07:00
kevinz000
b8374feafd Update plushes.dm 2019-09-07 17:03:06 -07:00
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
Linzolle
20ea620e9e literally why even 2019-09-07 16:46:25 -05:00
kevinz000
8f577e910a Merge pull request #9238 from Trilbyspaceclone/surgery_stuff 
Adds two more surgerys - Embalming and Body Rejuvenation
 2019-09-07 11:37:13 -07:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
kevinz000
0f6828e76e Merge pull request #9224 from kappa-sama/apeserum 
traitor geneticists can now go ape
 2019-09-07 11:27:44 -07:00
kevinz000
c5f3f3d7f9 Merge pull request #9250 from MrJWhit/abductor-spawntext 
Changes Abductor Spawntext
 2019-09-07 11:26:38 -07:00
MrJWhit
97072c63c8 Adds text to not disturb the habatat to abductor spawntext 
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
 2019-09-07 13:52:08 -04:00
kevinz000
87cf0b971a Merge pull request #9221 from Sishen1542/chappy 
adds some new nullrods with some back end null rod refactors
 2019-09-06 16:47:46 -07:00
Trilbyspaceclone
8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00
Trilbyspaceclone
3c38e6eb3d Update cleanbot.dm 2019-09-06 18:49:42 -04:00
kevinz000
e71dad4ecc Merge pull request #9242 from kappa-sama/bootcult 
cultist boot cultist boot?
 2019-09-06 11:45:56 -07:00
kevinz000
4b0505f691 Merge pull request #9239 from Trilbyspaceclone/patch-222 
Nerfs earths blood stam regen from 30  - > 13
 2019-09-06 11:45:21 -07:00
Sishen
dab0829da8 normalizes head roles not rolling the more common antags (wiz is kept) 2019-09-06 04:50:20 -04:00
BlackMajor
3e5a192af0 Updates borg examine to also show what module type they are. 2019-09-06 13:31:01 +12:00
BlackMajor
cca2001ccb Fixes dogborgs not using their deadsprite 2019-09-06 12:29:36 +12:00
Fermi
816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00