shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,398 Commits 5 Branches 0 Tags
173ecfaa6cbcc8053eecaa1fc305cb4e059caa12
Commit Graph

25189 Commits

Author SHA1 Message Date
DeltaFire
173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2 
Adds craftable railings
 2020-10-01 03:13:51 -07:00
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine 
Ascent Port Project: Methane and Methyl Bromide Gas Additions
 2020-10-01 03:13:15 -07:00
silicons
3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch 
Makes fever use the proper thresholds and shivering have thresholds at all.
 2020-10-01 03:11:23 -07:00
silicons
71de73e16b Merge pull request #13423 from MrJWhit/drone-e-button 
Gives drones back their e button (port)
 2020-10-01 03:11:04 -07:00
silicons
fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot 
Fixes vore prefs (I was looking in the wrong place the whole time)
 2020-10-01 03:10:04 -07:00
silicons
4dd9f20d22 Merge pull request #13470 from EmeraldSundisk/skelter 
Helter-Skelter.
 2020-10-01 03:09:51 -07:00
silicons
38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix 
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
 2020-10-01 03:07:08 -07:00
silicons
bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites 
adds luminescent and stargazer sprites as selectable body sprites for slimes
 2020-10-01 03:06:41 -07:00
silicons
f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3 
smoke machine/autoharvest hydro tray fix
 2020-10-01 03:06:19 -07:00
silicons
7553508a2a Merge pull request #13455 from Putnam3145/pyroclastic-policy 
Added policy config for sentient pyro slimes (no actual policy yet)
 2020-10-01 03:06:03 -07:00
silicons
a9ad06c107 Merge pull request #13446 from Putnam3145/dynamic-why-prob 
Makes dynamic less probabilistic, keeping the desired threat level more aggressively
 2020-10-01 03:05:15 -07:00
silicons
47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors 
Gabbys new wooden floor tile types
 2020-10-01 03:04:21 -07:00
silicons
ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes 
Gives Cargo Technicians the choice of longer trousers.
 2020-10-01 03:03:41 -07:00
silicons
095a6ae008 Merge pull request #13429 from Putnam3145/fix-initial-atmos 
Fixed a dumb typo that may or may not be causing atmos jank.
 2020-10-01 03:03:24 -07:00
silicons
b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config 
wound config values, wound bonus for how damaged a limb is
 2020-10-01 03:02:35 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
silicons
46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter 
Ports tgstation/tgstation#52549
 2020-10-01 02:56:39 -07:00
Ghom
7f08969f48 Merge pull request #13457 from SandPoot/master 
Fixes not getting an action button.
 2020-10-01 11:44:22 +02:00
Ghom
a2597a4d84 Merge pull request #13448 from Tupinambis/spelling 
Fixes a spelling error in an armor value that caused runtimes.
 2020-10-01 11:42:55 +02:00
Ghom
fb95d873aa Merge pull request #13383 from Citadel-Station-13/silicons-patch-37 
fixes bomb component allowing pickup
 2020-10-01 11:42:21 +02:00
Ghom
dd43594e5b Merge pull request #13417 from Citadel-Station-13/silicons-patch-1 
fixes mecha trackers
 2020-10-01 11:40:24 +02:00
Putnam3145
22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix 
Fixes angels not being fast while flying
 2020-10-01 02:40:18 -07:00
Putnam3145
50894bc627 Merge pull request #13454 from Citadel-Station-13/silicons-patch-6 
fixes botany harvest causing attack hand to runtime
 2020-10-01 02:39:38 -07:00
Putnam3145
005376be2e Merge pull request #13418 from Citadel-Station-13/silicons-patch-3 
bumps typing indicator timeout because 5 minutes is too little to write emotes
 2020-10-01 02:35:53 -07:00
Putnam3145
44f05bcb21 Merge pull request #13372 from Citadel-Station-13/silicons-patch-35 
please stop using explosive holoparasites to make instant kill toolboxes
 2020-10-01 02:35:12 -07:00
Letter N
c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Letter N
d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Letter N
945bf051bd get railed 2020-10-01 11:28:56 +08:00
Tupinambis
67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05:00
silicons
28ea9cc91c Merge pull request #13469 from Citadel-Station-13/revert-13436-worse-idea 
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
 2020-09-30 11:54:52 -07:00
silicons
9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises 
Unique slimeperson screams and laughter, and adds new customizable speech verbs
 2020-09-30 09:22:25 -07:00
Putnam
c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam
0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Zandario
9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
EmeraldSundisk
a41963fa13 Update space.dm 2020-09-29 13:03:11 -07:00
EmeraldSundisk
41d263da84 Update space.dm 2020-09-29 12:43:40 -07:00
Putnam
f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
Putnam
0aec88eaed escape those newlines 2020-09-29 06:12:10 -07:00
Putnam
8704949694 whoops forgot a semicolon 2020-09-29 05:58:04 -07:00
Putnam
3839343cd8 i forgot to save the #define 2020-09-29 05:57:46 -07:00
Putnam
02b2248f3a i am not smart at all 2020-09-29 05:56:34 -07:00
Putnam
4d2a2b178b Made transfer_ckey reset view range. 2020-09-29 04:11:01 -07:00
Putnam
8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
EmeraldSundisk
633da981e2 Update space.dm 2020-09-28 23:01:31 -07:00
EmeraldSundisk
0f88f93f59 4now 2020-09-28 22:51:59 -07:00
timothyteakettle
396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle
783c33067b typo moment 2020-09-28 22:13:33 +01:00
Timothy Teakettle
29368a4479 sprites 2020-09-28 18:55:01 +01:00
lolman360
a2b7fd2279 sprite 2020-09-28 16:09:10 +10:00