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

1979 Commits

Author SHA1 Message Date
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -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
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
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Winter Flare
04c302b08e Service Tweaks 
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
 2019-08-15 06:28:46 -04:00
Winter Flare
141a93236c Service QoL 
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
 2019-08-14 04:01:18 -04:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
Fermi
02b5100be7 Made scans advanced. 2019-08-09 13:01:14 +01:00
Fermi
6e0303fdba Actual fix for #9091 2019-08-09 12:48:26 +01:00
Fermi
34cfd2c1e3 Fix for #9091 2019-08-09 12:12:25 +01:00
Ghommie
12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie
de8137d6c8 One line fix for invisible zipties. 2019-08-06 23:19:28 +02:00
Fermi
ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000
b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00
kevinz000
86a2d917e5 Merge pull request #8913 from Trilbyspaceclone/clockstoles 
Makes brass/bronze bar stools and stools - Same as normal ones
 2019-08-05 00:45:56 -07:00
kevinz000
9852084200 Merge pull request #9019 from Ghommie/Ghommie-cit172 
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
 2019-08-05 00:44:15 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
kevinz000
489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166 
Adds in worn overlays for different types of cuffs.
 2019-08-04 19:19:19 -07:00
kevinz000
7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes 
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
 2019-08-04 19:15:18 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Poojawa
6db4cbf8b0 itsworking.avi 2019-08-04 01:32:51 -05:00
Chayse Ramsay
f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay
46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting 
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
 2019-08-02 00:57:05 -07:00
kevinz000
dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201 
Ports "Gauze can now be applied to corpses #44199"
 2019-08-02 00:54:57 -07:00
Poojawa
657d3528e2 some good work here 2019-08-01 17:35:37 -05:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
6dd92ce122 . 2019-07-31 21:26:59 +02:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Ghommie
16afae1e14 boolean 2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix 
Mobs eaten by His Grace now require a mind attached to count for ascension
 2019-07-29 04:47:44 -07:00
kevinz000
a95fff589c Merge pull request #8966 from Poojawa/RLD-fix 
Gives RLD adaptive overlays, adds cable color to RCL sprites
 2019-07-29 04:41:07 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored 
Removes stealth implant box integrity
 2019-07-29 04:38:42 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160 
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
 2019-07-29 04:37:36 -07:00
kevinz000
156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162 
allows the captain sabre sheat to hold stunswords.
 2019-07-29 04:37:21 -07:00