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

9226 Commits

Author SHA1 Message Date
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa
b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Poojawa
cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05: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
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
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 
Patch 213
 2019-08-19 11:12:50 +10: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
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
Poojawa
5746126794 since it conflicted there, let's just fix it here 2019-08-17 05:43:24 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa
725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05: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
Poojawa
8bd54bcc54 I'm just waiting for a better idea before dumping this hot garbage again 2019-08-16 06:24:42 -05:00
Poojawa
d71f37167f I'm about to go fucking APE 
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
 2019-08-16 04:58:16 -05:00
Poojawa
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00