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

16781 Commits

Author SHA1 Message Date
Timothy Teakettle
d3a042deaa Revert "Merge branch 'master' into eye-sprites" 
This reverts commit b48f4b91e6, reversing
changes made to dc70d17a1e.
 2020-10-11 16:54:05 +01:00
Timothy Teakettle
b650fa1761 Revert "finishing touches" 
This reverts commit 05aef528d7.
 2020-10-11 16:54:01 +01:00
Timothy Teakettle
c770a90ccb Revert "cleanup" 
This reverts commit 1fc7d9a21e.
 2020-10-11 16:53:57 +01:00
Timothy Teakettle
1fc7d9a21e cleanup 2020-10-08 17:43:56 +01:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
timothyteakettle
dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
silicons
6094cd7191 Merge pull request #13508 from DeltaFire15/robotic-fixes 
bodypart fixes - robotic bodypart & digitigrade edition
 2020-10-03 14:32:45 -07:00
silicons
d5ff552f3e Merge pull request #13494 from monster860/patch-4 
Makes the slimeperson swap-body UI stay open when you switch bodies
 2020-10-03 14:22:11 -07:00
silicons
6b7585ba54 Merge pull request #13493 from timothyteakettle/gender-bodypart-support 
adds limb id support for gendered body parts
 2020-10-03 14:21:49 -07:00
silicons
0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define 
standardizes minimum brightness of mutant parts
 2020-10-03 14:21:20 -07:00
silicons
73cebb3629 Merge pull request #13482 from DeltaFire15/heretic-husking-tweak 
Tweaks heretic sacrifice husking
 2020-10-03 14:20:58 -07:00
silicons
3e6428567a Merge pull request #13488 from DeltaFire15/pacifist-parry-fix 
No harmful parry countering for pacifists.
 2020-10-03 14:20:07 -07:00
DeltaFire
c2e6fcb172 modifies regenerate_limbs() 
This allows it to work for people with the ROBOTIC_LIMBS trait, creating robotic (/ synthetic, or whatever the hell those are considering they're inbetween) limbs for them instead of organic ones
 2020-10-03 22:46:01 +02:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Putnam
737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -07:00
Maxim Nikitin
4b6870ed1b the fuck 2020-10-02 12:07:09 -04:00
Maxim Nikitin
64b4abca4b oopsie 2020-10-02 12:05:05 -04:00
Maxim Nikitin
96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
timothyteakettle
158b1d584f woopsy 2020-10-02 14:54:57 +01:00
timothyteakettle
3ba9031fe2 Revert "gender part support" 
This reverts commit 358041c2ef.
 2020-10-02 14:54:05 +01:00
timothyteakettle
358041c2ef gender part support 2020-10-02 14:50:42 +01:00
silicons
f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs 
makes ipcs more like robots (a partial port from skyrat)
 2020-10-01 14:15:04 -07:00
Timothy Teakettle
710ab0ffa6 Update eyes.dm 2020-10-01 22:06:03 +01:00
silicons
7e7fd351c1 Merge pull request #13475 from Detective-Google/clothing 
Ports a few RP clothings and adds the detective clothing vendor
 2020-10-01 14:04:52 -07:00
Timothy Teakettle
cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Timothy Teakettle
14e217082f compile 2020-10-01 20:51:53 +01:00
silicons
1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort 
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
 2020-10-01 12:15:49 -07:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Timothy Teakettle
e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire
173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
CoreFlare
9d76f6af80 good cloaks 
i like gooder cloaks
 2020-10-01 15:08:39 +01:00
The0bserver
9e702c2ede No more self sufficiency. 2020-10-01 06:49:54 -04:00
The0bserver
e0089ea813 Again? 2020-10-01 06:44:11 -04: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
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
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
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
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
The0bserver
fc3feae4c5 Plumbing component removed, for now. 2020-10-01 05:43:09 -04: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
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