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

26370 Commits

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
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
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
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
silicons
0555756dde Merge pull request #13946 from uomo91/logfix 
[Port] Fixes log collisions
 2021-01-03 18:08:39 -07:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07: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
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
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
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
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
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
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
silicons
1b9a399bbd Merge pull request #13905 from zeroisthebiggay/help 
gives codex cicatrix inhands
 2020-12-30 14:46:26 -07:00
silicons
3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid 
salicyclic acid
 2020-12-30 14:46:04 -07:00
silicons
e91b3b7a81 Merge pull request #13916 from timothyteakettle/better-holoforms 
reverts the removal of the holoform verb because kevin likes it
 2020-12-30 14:45:23 -07:00
silicons
813471dbbb Merge pull request #13914 from EmeraldSundisk/cog2020 
Some area designation fixes for CogStation.
 2020-12-30 14:44:52 -07:00
silicons
667651aebb Merge pull request #13915 from Xantholne/Birdsitfix 
Fixes new bird sprites defaulting to basic parrot when sitting
 2020-12-30 14:44:28 -07:00
silicons
a9d831d10d Update guardian.dm 2020-12-30 14:36:39 -07:00
silicons
909b25892f Update belly_obj.dm 2020-12-30 14:22:32 -07:00
silicons
23e77db584 Update belly_obj.dm 2020-12-30 14:19:37 -07:00
MrJWhit
258c6f3818 Update arousal.dm 2020-12-30 16:14:03 -05:00
DeltaFire
f957636a82 Merge pull request #13917 from timothyteakettle/squeak 
*squeak
 2020-12-30 18:32:30 +01:00
DeltaFire
eebb2e945a Merge pull request #13902 from timothyteakettle/slime-legs 
slimes can now have digitigrade/avian legs
 2020-12-30 18:25:48 +01:00
DeltaFire
3dbf4830f0 Merge pull request #13892 from Citadel-Station-13/silicons-patch-50 
rebalances changeling combat mutations
 2020-12-30 18:17:30 +01:00
SandPoot
1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
Timothy Teakettle
a4a2765735 Update client_procs.dm 2020-12-30 16:56:03 +00:00
DeltaFire
1e3c2f802f Merge pull request #13913 from keronshb/scarpparrytweak 
Local Martial Artist forgets one line of code (fixes Scarp Parrying)
 2020-12-30 17:53:41 +01:00
Lin
b062104c2f Merge pull request #13903 from DeltaFire15/ling-deathgasps 
Lings no longer deathgasp twice when entering regen stasis
 2020-12-30 04:09:17 +00:00
Xantholne
19c954fb39 asdafsafas 2020-12-29 21:04:08 -07:00
Lin
f303151b5f Merge pull request #13910 from Citadel-Station-13/silicons-patch-55 
override movespeed for wheelchairs
 2020-12-30 03:59:40 +00:00
Xantholne
0db821f4f5 Fixes missing electus red from trying to be basic parrot and adds 2020-12-29 19:33:09 -07:00
Timothy Teakettle
e9d5b622a1 squeak 2020-12-30 02:25:53 +00:00