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

9523 Commits

Author SHA1 Message Date
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
Trilbyspaceclone
7ddfff7f5c Update uplink_items.dm 2019-08-16 23:07:15 -04:00
deathride58
20d71d1196 Fixes warp whistle runtimes for real this time. 2019-08-16 22:19:37 -04:00
lolman360
d93fceec98 oops recipe time thanks pax 2019-08-17 12:15:17 +10:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
kevinz000
c2dd7111d0 Merge pull request #9112 from Trilbyspaceclone/patch-209 
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
 2019-08-16 17:17:04 -07:00
kevinz000
f26718aab2 Merge pull request #9138 from kappa-sama/canefix 
re-adds sugarcane seeds to megaseed vendors
 2019-08-16 17:14:28 -07:00
kevinz000
9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes 
Fixes some runtimes and removes a holodeck exploit
 2019-08-16 17:05:21 -07:00
kevinz000
f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff 
Service QoL
 2019-08-16 17:03:11 -07:00
kevinz000
cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes 
Prevents runtime spam from Hugs of the North Star
 2019-08-16 16:59:11 -07:00
kevinz000
bdf7fb6980 Merge pull request #9119 from Linzolle/miningshuttle 
Adds mining shuttle console to the techweb.
 2019-08-16 16:58:27 -07:00
kevinz000
97306ff53c Merge pull request #9107 from deathride58/fixesarest 
Fixes handcuffs being impossible to actually resist out of
 2019-08-16 16:57:36 -07:00
kappa-sama
4ca72c7733 re-add sugarcane to megaseed vendors 
how did this happen
 2019-08-16 14:38:25 -04:00
Arturlang
b7ae88b6e3 Made it sound a bit nicer 2019-08-16 19:40:22 +03:00
Sishen
542915faa6 Update ert.dm 2019-08-16 10:53:24 -04:00
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
Sishen
03ec103e3d Update strained_muscles.dm 2019-08-16 10:02:52 -04:00
Arturlang
2ca6464242 Update healing.dm 2019-08-16 15:32:08 +03:00
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00