shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

40276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit 
Paramedic EVA suit now purchasable from Cargo
 2021-01-03 18:09:59 -07:00
CitadelStationBot
693b99edf2 Automatic changelog generation for PR #13941 [ci skip] 2021-01-03 19:09:53 -06:00
silicons
2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix 
Portable Chem Mixer now added to the Biological Technology tech node.
 2021-01-03 18:09:50 -07:00
silicons
0581748282 Merge pull request #13942 from YakumoChen/power-sink 
#13925 but doesn't underestimate engineering autism
 2021-01-03 18:09:38 -07:00
CitadelStationBot
c825174283 Automatic changelog generation for PR #13943 [ci skip] 2021-01-03 19:09:23 -06:00
silicons
89913ebc18 Merge pull request #13943 from Hatterhat/imagine-modularizing 
utility uniform typos and making the capdrobe not suck
 2021-01-03 18:09:20 -07:00
CitadelStationBot
8e97f87f70 Automatic changelog generation for PR #13945 [ci skip] 2021-01-03 19:09:01 -06:00
silicons
d6bd5d4bac Merge pull request #13945 from DeltaFire15/synth-organ-printing 
Makes IPC cells & power cords printable
 2021-01-03 18:08:58 -07:00
CitadelStationBot
de5e817692 Automatic changelog generation for PR #13946 [ci skip] 2021-01-03 19:08:42 -06:00
silicons
0555756dde Merge pull request #13946 from uomo91/logfix 
[Port] Fixes log collisions
 2021-01-03 18:08:39 -07:00
CitadelStationBot
f97d750909 Automatic changelog generation for PR #13950 [ci skip] 2021-01-03 19:08:17 -06:00
silicons
64a5b99e63 Merge pull request #13950 from TripleShades/meta-medical 
MetaStation Paramedical + Surgery Revamp
 2021-01-03 18:08:15 -07:00
CitadelStationBot
d9d0763004 Automatic changelog generation for PR #13859 [ci skip] 2021-01-03 19:07:21 -06:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07:00
TripleShades
79db7e0db5 Changed out lightswitch for extinguisher on Recovery Room outer wall; Replaced wall with Clean Hands poster with a drape; Added Nanomeds to surgery 2021-01-02 16:00:49 -08:00
Lin
b3c1c69861 Merge pull request #13944 from Citadel-Station-13/silicons-patch-59 
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
 2021-01-02 16:17:24 +00:00
TripleShades
bf8c87f373 Update MetaStation.dmm 
fixes surgery apc being rotated incorrectly, moves wheelchair out of storage for public access
 2021-01-01 15:49:57 -08:00
TripleShades
c57a5520fa Update MetaStation.dmm 2021-01-01 14:59:01 -08:00
Timothy Teakettle
dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle
974f46cb22 attempt to fix 2021-01-01 22:36:35 +00:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
CitadelStationBot
368a8d5726 Automatic changelog generation for PR #13930 [ci skip] 2021-01-01 03:17:19 -06:00
silicons
9cebd096eb Merge pull request #13930 from MrJWhit/fixing-up-sec-on-box 
Touchups for sec box
 2021-01-01 02:17:16 -07:00
CitadelStationBot
7b9a2656ce Automatic changelog generation for PR #13924 [ci skip] 2021-01-01 01:15:55 -06:00
DeltaFire
a2bb761bee Merge pull request #13924 from SandPoot/master 
Allows mass sticking money into your id
 2021-01-01 08:15:53 +01:00
DeltaFire
ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58 
fixes a bug
 2021-01-01 08:11:40 +01:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
DeltaFire
2ed866d855 boom 2021-01-01 07:22:10 +01:00
silicons
fbb2cfbba1 Update colormate.dm 2020-12-31 23:05:14 -07:00
Hatterhat
e63e0ac9bd something about wardrobes 2020-12-31 22:03:09 -06:00
YakumoChen
9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00
YakumoChen
7865642132 Merge pull request #15 from Citadel-Station-13/master 
l
 2020-12-31 22:18:26 -05:00
CitadelStationBot
3533f2f494 Automatic changelog generation for PR #13909 [ci skip] 2020-12-31 21:14:29 -06:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays 
Twitch Plays: Clown Car
 2021-01-01 04:14:26 +01:00
Chiirno
218cac1a49 OK, chem mixer has been added to a tech node now. 2020-12-31 22:19:51 -04:00
Chiirno
6f5837d14f changed the description of the crate. 2020-12-31 17:42:07 -04:00
Chiirno
d936b43e98 adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750 2020-12-31 17:27:25 -04:00
Chiirno
7d0c4030c9 first commit, adding the paramed eva suit as an option for cargo. 2020-12-31 17:24:30 -04:00
silicons
1a027c2fa2 good catch 2020-12-31 13:34:47 -07:00
SandPoot
a0e95b7c3d Update code/modules/mining/ores_coins.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2020-12-31 16:59:33 -03:00
CitadelStationBot
0a4fe70873 Automatic changelog generation for PR #13885 [ci skip] 2020-12-31 13:38:09 -06:00
silicons
f1205efa0f Merge pull request #13885 from raspy-on-osu/spaceheater-buff 
Makes space heaters worth using
 2020-12-31 12:38:07 -07:00
CitadelStationBot
0d796f84b2 Automatic changelog generation for PR #13867 [ci skip] 2020-12-31 13:35:42 -06:00
silicons
591aa78c24 Merge pull request #13867 from Citadel-Station-13/zeolite-easy 
Makes zeolites far, far easier to make
 2020-12-31 12:35:37 -07:00
DeltaFire
c699113061 Merge pull request #13928 from Citadel-Station-13/silicons-patch-57 
while we're at it let's make holoparasites not carry radiation either thanks @lbd
 2020-12-31 19:01:12 +01:00
silicons
9c0762f35a Update say_vr.dm 2020-12-31 03:41:55 -07:00
MrJWhit
d0aaf0abfc touchups for sec box 2020-12-30 21:00:46 -05:00
CitadelStationBot
8f8ab6ff13 Automatic changelog generation for PR #13926 [ci skip] 2020-12-30 15:48:52 -06:00
silicons
bfa66b2810 Merge pull request #13926 from MrJWhit/revert-kevins-shame 
Revert kevinzs' shame
 2020-12-30 14:48:49 -07:00
DeltaFire
62a238e556 Merge pull request #13927 from Citadel-Station-13/silicons-patch-56 
FUCK OFF WHY IS VORE SHITCODE CAUSING CHERNOBYL AGAIN I HATE VORE CODE
 2020-12-30 22:46:36 +01:00