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

26318 Commits

Author SHA1 Message Date
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
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
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
Timothy Teakettle
5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
EmeraldSundisk
b1f76a8566 Update Space_Station_13_areas.dm 2020-12-29 11:38:07 -08:00
EmeraldSundisk
0707f6ecfc Update Space_Station_13_areas.dm 2020-12-29 10:56:58 -08:00
EmeraldSundisk
6af5d180d0 Update Space_Station_13_areas.dm 2020-12-29 10:29:28 -08:00
keronshb
99a890b355 Adds block_parry_data 
Ooops forgot one line of code
 2020-12-29 09:30:29 -05:00
silicons
2e071b1e0b Merge pull request #13908 from Citadel-Station-13/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2020-12-29 01:28:12 -07:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice 
Paramed office on box + Surgery remodel
 2020-12-29 01:27:49 -07:00
silicons
a0fb594236 Merge pull request #13900 from Xantholne/Birds 
Ports cute birbs from RP
 2020-12-29 00:50:58 -07:00
raspy-on-osu
d2c0e1ba41 salicyclic acid 2020-12-29 02:35:42 -05:00
silicons
2a58afa77e Update wheelchair.dm 2020-12-28 18:57:51 -07:00
tgstation-server
14cefb2d35 Update TGS DMAPI 2020-12-29 00:59:40 +00:00
silicons
cc0556267e Merge pull request #13904 from DeltaFire15/summonitem-stuff 
Adds some more instant summons safety
 2020-12-28 13:53:46 -07:00
zerothebigboy
6f38ec403f help 2020-12-28 15:34:35 -05:00
silicons
1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle 
removes slime layering and stops puddle tackling
 2020-12-28 13:15:30 -07:00
DeltaFire
687c6a9e6f and another one 2020-12-28 19:49:42 +01:00
DeltaFire
0bba554052 e 2020-12-28 19:45:03 +01:00
DeltaFire
01f1844781 there 2020-12-28 19:15:59 +01:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
Timothy Teakettle
bdb05f5e85 Merge remote-tracking branch 'upstream/master' into slime-legs 2020-12-28 17:22:53 +00:00
DeltaFire
b1be0159e2 Merge pull request #13877 from Citadel-Station-13/silicons-patch-43 
heretics uses killonce objectives
 2020-12-28 17:56:58 +01:00
DeltaFire
13cd2c4424 Merge pull request #13880 from Citadel-Station-13/silicons-patch-46 
antag rep configs are now actually possible to set for jobs with more than one word in the title
 2020-12-28 17:56:17 +01:00
DeltaFire
3435a99ec7 Merge pull request #13882 from silicons/subtler_tables 
adds subtler emote that wraps around adjacent tables
 2020-12-28 17:55:27 +01:00
DeltaFire
999b4c403b Merge pull request #13883 from silicons/temporary_flavortext 
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
 2020-12-28 17:53:32 +01:00
DeltaFire
f89edd5c10 Merge pull request #13886 from Citadel-Station-13/silicons-patch-47 
respawn text now shows AFTER motd (probably)
 2020-12-28 17:46:36 +01:00
DeltaFire
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description 
Fix for Necrotizing Fasciitis
 2020-12-28 17:43:39 +01:00
DeltaFire
a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48 
adds vv wrapper for snowflake plushies
 2020-12-28 17:42:26 +01:00
DeltaFire
9b6d4c1371 Merge pull request #13889 from Citadel-Station-13/silicons-patch-49 
adds recursive pulling check to space transitions
 2020-12-28 17:39:59 +01:00
DeltaFire
58accc3782 Merge pull request #13898 from Putnam3145/fix-coma-sleep 
Makes regen coma properly work at 25% when sleeping; makes coma more precedent
 2020-12-28 17:34:14 +01:00
DeltaFire
bd0c799e66 Merge pull request #13896 from Sonic121x/patch-3 
cydonia helmet fix & taur(naga&canine)Ert hardsuit
 2020-12-28 17:15:49 +01:00
DeltaFire
8b723ab6c7 Merge pull request #13894 from Citadel-Station-13/silicons-patch-52 
reduces coldslowdown to tempdiff / 35 instead of tempdiff / 20
 2020-12-28 17:11:33 +01:00
DeltaFire
49252f4eff Merge pull request #13893 from Citadel-Station-13/silicons-patch-51 
Nerfs meth and morphine to only remove damage slowdown rather than all slowdown (read this carefully, as this affects lings)
 2020-12-28 17:10:26 +01:00