shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,197 Commits 5 Branches 0 Tags
1a2abc5a2edca6dc4626e35cdbdd2d40307f25da
Commit Graph

17076 Commits

Author SHA1 Message Date
silicons
b2336f1140 Merge pull request #13527 from ArchieBeepBoop/rtg 
Fully Upgraded Advanced RTG Machine Preset
 2020-10-10 22:01:20 -07:00
silicons
737b6460af Merge pull request #13497 from Zandario/species-refactor 
Refactors some defines for easier Species Development
 2020-10-10 22:00:49 -07:00
silicons
8b48cab574 Merge pull request #13233 from Hatterhat/za-hando 
[READY] za hando - a pr about ling claws and punching shit
 2020-10-10 21:59:05 -07:00
silicons
2919dfee2e Merge pull request #13014 from Hatterhat/tendril-minimum 
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
 2020-10-10 21:58:15 -07:00
DeltaFire
c412358d4e another typo 2020-10-11 03:58:38 +02:00
zerothebigboy
ef073167df crepe 2020-10-10 21:39:45 -04:00
silicons
f4cfc6c1e0 Update holidays.dm 2020-10-10 16:47:03 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire
c5bb85d794 Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 00:47:54 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
Putnam3145
4f5f56e68f Merge pull request #13531 from DeltaFire15/quick-fix 
Oops! Regenerate_bodyparts-edition
 2020-10-10 15:33:59 -07:00
DeltaFire
9990337f32 fixes a bunch of portal runtimes 
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
 2020-10-10 23:40:12 +02:00
zerothebigboy
285b26d35e sex 2020-10-10 15:08:22 -04:00
silicons
ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle 
the pr that lets slimes turn into useless puddles
 2020-10-10 11:14:25 -07:00
Putnam3145
d8b39bcc5f Merge pull request #13405 from silicons/tracer 
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
 2020-10-10 11:02:30 -07:00
Timothy Teakettle
a1ccc31877 fuck you travis 2020-10-10 18:05:31 +01:00
DeltaFire
641970f2c0 fixes two typos 
yeah, I got those two wrong. Not anymore though.
 2020-10-10 16:48:25 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
silicons
04db791004 Update human.dm (#13491) 2020-10-10 11:57:35 +02:00
silicons
7200f2b004 Update emote.dm 2020-10-10 02:47:28 -07:00
The0bserver
10009a39d7 Review Change Request 1 2020-10-09 09:17:28 -04:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
The0bserver
0d8bea1c9b QoL: Adds BSB's to Service, adds R.Plunger design 2020-10-08 23:27:17 -04:00
The0bserver
96c6608d59 enabled plumbing on trays. 2020-10-08 22:50:24 -04:00
Zandario
8e4c64a24b Remove clothing shito as requested 2020-10-08 18:48:26 -05:00
DeltaFire
2d684c88be readds a accidentally removed thing 
Apparently, someone accidentally removed the functionality of being able to inject beakers in heaters without having to remove them, which is pretty required fore more complex reactions. This readds that.
Also tweaks the Ion release of the zeolite reaction a bit (-0.2 > -0.15)
 2020-10-09 00:06:01 +02:00
Putnam3145
f561389970 Merge pull request #13539 from timothyteakettle/eye-sprites 
cleans up the eye customization pr
 2020-10-08 10:05:30 -07:00
Timothy Teakettle
1fc7d9a21e cleanup 2020-10-08 17:43:56 +01:00
Timothy Teakettle
d37d7bddae Update jellypeople.dm 2020-10-08 04:20:42 +01:00
timothyteakettle
9d99061ff5 what the fuck git 2020-10-07 23:40:59 +01:00
Timothy Teakettle
e2c6a19da7 Merge branch 'master' into slime-puddle 2020-10-07 23:37:30 +01:00
Putnam3145
64ee40b185 Merge pull request #13449 from Citadel-Station-13/silicons-patch-4 
ok it turns out extools hooked procs do not play nice with call() or something so let's add admin proccall wrappers for some important atmospherics procs so i can flex the ability to undo atmospherics grief with one line of sdql2
 2020-10-07 15:10:48 -07:00
Putnam3145
3edc471012 Merge pull request #13517 from Citadel-Station-13/silicons-patch-11 
"are you sure we should remove mobs from the immunity typecache" v2: electric boogaloo
 2020-10-07 15:07:52 -07:00
silicons
eda0eda754 Update movement.dm 2020-10-07 10:46:00 -07:00
Hatterhat
9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
shellspeed1
2c59a5b9f8 more spelling 2020-10-06 17:36:57 -07:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
d2ce51ccb9 Merge pull request #13526 from Putnam3145/fix-vore-AGAIN-PLEASE 
Adds a line that actually saves vore prefs to the vore pref saving
 2020-10-06 17:06:08 -07:00
silicons
3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade 
Lingblood rework (Loudness is now an average, rather than a sum)
 2020-10-06 17:04:38 -07:00
silicons
efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger 
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
 2020-10-06 17:03:44 -07:00
silicons
db6e5d86d8 Merge pull request #13504 from zeroisthebiggay/yeah 
buffs stands in general, adds gravitokinetic stand type from tg, fixes broken protector shield
 2020-10-06 17:03:16 -07:00
silicons
eae67e38f4 Merge pull request #13509 from EmeraldSundisk/helter 
Slight adjustment to the "Skelter" ruin.
 2020-10-06 17:02:24 -07:00
silicons
df2f086c42 Merge pull request #13519 from Detective-Google/licc 
licking people is now an epic radial
 2020-10-06 17:01:35 -07:00
silicons
c828bd586c Merge pull request #13516 from yorii/patch-1 
fixes rounding error in growthstages
 2020-10-06 17:01:15 -07:00
silicons
bbc0dc982d Merge pull request #13514 from Thalpy/JacqFixes2020edition 
Jacq fixes2020edition
 2020-10-06 17:00:39 -07:00
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites 
adds selectable eye types to customization
 2020-10-06 16:51:44 -07:00
silicons
8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver 
additional revolver sprites
 2020-10-06 16:51:18 -07:00
silicons
03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading 
qol: looking at loadout equips your loadout items on you instead of job items
 2020-10-06 16:50:08 -07:00