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

9386 Commits

Author SHA1 Message Date
Trilbyspaceclone
cce33ec7e5 Update drink_reagents.dm 2019-08-19 07:17:57 -04:00
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 
Removes Nitryl bounty but adds 7 more in!
 2019-08-19 20:07:40 +12:00
Poojawa
8ad705ec74 Update curator.dm 2019-08-19 02:16:30 -05:00
kevinz000
1ab64d4003 Update ert.dm 2019-08-18 23:43:31 -07:00
kevinz000
86cb735cc9 Merge branch 'master' into kevinz000-patch-64 2019-08-18 23:41:40 -07:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such 
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
 2019-08-18 23:37:56 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
kevinz000
558ea557f8 Merge pull request #9151 from Trilbyspaceclone/cloak 
Adds chameloen necktie item
 2019-08-18 23:34:03 -07:00
kevinz000
ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals 
Nanite Adv toxin healing now heals slimes
 2019-08-18 23:33:02 -07:00
kevinz000
f55682d6dd Merge pull request #9136 from Sishen1542/strained 
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
 2019-08-18 23:32:47 -07:00
kevinz000
86cfd8a561 Merge pull request #9141 from deathride58/removwarpwissle 
Actually fixes warp whistle runtimes
 2019-08-18 23:32:15 -07:00
kevinz000
17a522300c Update hardsuit.dm 2019-08-18 20:05:42 -07:00
Poojawa
f130bfe32e Merge branch 'job-menu-improvements' of https://github.com/Poojawa/Citadel-Station-13-portworks into job-menu-improvements 2019-08-18 21:27:03 -05:00
Poojawa
43541b043d Update warden.dm 2019-08-18 21:27:00 -05:00
Poojawa
70e3964fd2 Update head_of_security.dm 2019-08-18 21:22:10 -05:00
Code-Cygnet
c8810be706 Update captain.dm 2019-08-18 22:15:52 -04:00
Code-Cygnet
5840284e9e Update alcohol_reagents.dm 
Edited a typo at line 2144.
 2019-08-18 22:14:41 -04:00
Code-Cygnet
32695f28cf Merge branch 'master' into The-Art-of-Drunken-Captaining 2019-08-18 22:12:23 -04:00
Code-Cygnet
a351d8f995 Update captain.dm 
Attempted error fix.
 2019-08-18 21:34:31 -04:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 
Patch 213
 2019-08-19 11:12:50 +10:00
Poojawa
9cbd8af5b9 Updates colors, fixes alignment issues. 2019-08-18 14:38:10 -05:00
kevinz000
2c000636dd Update hardsuit.dm 2019-08-18 07:24:58 -07:00
Poojawa
5d33321f80 Merge remote-tracking branch 'refs/remotes/origin/job-pref-jonks' into job-menu-improvements 2019-08-18 07:46:00 -05:00
Poojawa
867b112158 HOW DID THIS NOT GET UPDATED???? 2019-08-18 07:44:46 -05:00
Poojawa
c4198296d0 and this too 2019-08-18 04:26:30 -05:00
Poojawa
5e03f5be3d Update shaft_miner.dm 2019-08-18 04:24:48 -05:00
Poojawa
b5da43c1b7 Gives Sec Officers back their stun combat weapons 2019-08-18 04:04:05 -05:00
Poojawa
933db4d05f reverts the overly greyish colors back to vibrant ones 2019-08-18 01:00:16 -05:00
TrilbySpaceClone
e1cee15720 seed 2019-08-18 01:40:36 -04:00
TrilbySpaceClone
566a4e65a1 right crafting 2019-08-18 01:31:38 -04:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
Poojawa
b5842048b4 blacklisting quirks 2019-08-17 23:42:01 -05:00
Poojawa
2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12:00
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
Code-Cygnet
975a33aad7 Update alcohol_reagents.dm 
Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully.
 2019-08-17 19:38:58 -04:00
Code-Cygnet
d2760287e1 Update captain.dm 
Adds mind trait at line 24
 2019-08-17 19:27:11 -04:00
Raptorizer
ff58fec243 New plant type: Peaches 
Botanists can now grow peaches from a new pack of seeds!
 2019-08-17 02:50:56 -05:00
Code-Cygnet
4b6b2cf195 Adds new drink to drink recipes 
It's a drink for Captains
 2019-08-17 01:37:28 -04:00
Trilbyspaceclone
bcf65dc901 Update drink_reagents.dm 2019-08-17 00:58:02 -04:00
Trilbyspaceclone
3851739533 Update other_reagents.dm 2019-08-17 00:06:58 -04:00
Trilbyspaceclone
c81fd8fcd4 Update drink_reagents.dm 2019-08-17 00:02:22 -04:00
Trilbyspaceclone
5225665516 kev fix 2019-08-16 23:48:41 -04:00