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

38772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
792080ca3f Merge pull request #13533 from shellspeed1/jambalya- 
Face hugger jambalaya. Should be ready.
 2020-10-10 22:02:46 -07:00
CitadelStationBot
120536d448 Automatic changelog generation for PR #13527 [ci skip] 2020-10-11 00:01:22 -05:00
silicons
b2336f1140 Merge pull request #13527 from ArchieBeepBoop/rtg 
Fully Upgraded Advanced RTG Machine Preset
 2020-10-10 22:01:20 -07:00
CitadelStationBot
3cf4874707 Automatic changelog generation for PR #13525 [ci skip] 2020-10-11 00:01:13 -05:00
silicons
1bd715ffc6 Merge pull request #13525 from Detective-Google/hilberts-juke 
fixes the hilbert's jukebox(?)
 2020-10-10 22:01:09 -07:00
CitadelStationBot
ef52d1272d Automatic changelog generation for PR #13497 [ci skip] 2020-10-11 00:00:52 -05: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
CitadelStationBot
e584c30cc3 Automatic changelog generation for PR #13233 [ci skip] 2020-10-10 23:59:08 -05: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
CitadelStationBot
63a8b8ed43 Automatic changelog generation for PR #13014 [ci skip] 2020-10-10 23:58:19 -05: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
CitadelStationBot
5d97b04a6f Automatic changelog generation for PR #13531 [ci skip] 2020-10-10 17:34:02 -05:00
Putnam3145
4f5f56e68f Merge pull request #13531 from DeltaFire15/quick-fix 
Oops! Regenerate_bodyparts-edition
 2020-10-10 15:33:59 -07:00
CitadelStationBot
b9aea84330 Automatic changelog generation for PR #13472 [ci skip] 2020-10-10 13:14:28 -05: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
CitadelStationBot
2f2cf75326 Automatic changelog generation for PR #13405 [ci skip] 2020-10-10 13:02:33 -05: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
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
CitadelStationBot
69ef1ed0e0 Automatic changelog generation for PR #13444 [ci skip] 2020-10-10 05:15:42 -05: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
Zandario
8e4c64a24b Remove clothing shito as requested 2020-10-08 18:48:26 -05:00
CitadelStationBot
15f7ce6731 Automatic changelog generation for PR #13539 [ci skip] 2020-10-08 12:05:34 -05: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
6b536c23c7 Merge pull request #13480 from Citadel-Station-13/silicons-patch-7 
[OH GOD TESTMERGE THIS FIRST] another microoptimization to GetAllContents() because microoptimizations are fun
 2020-10-07 15:09:26 -07:00
Putnam3145
ec091f9f99 Merge pull request #13453 from Citadel-Station-13/silicons-patch-5 
microoptimization to get rad contents
 2020-10-07 15:08:32 -07:00
Putnam3145
4b700a3ff7 Merge pull request #13490 from Citadel-Station-13/silicons-patch-8 
kind of easy to tell if you have a fake virus if it's ticking at 20 times the speed of a normal virus right
 2020-10-07 15:08:12 -07:00
CitadelStationBot
c682da6152 Automatic changelog generation for PR #13517 [ci skip] 2020-10-07 17:07:56 -05: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
Putnam3145
b0b3a1ea14 Merge pull request #13536 from Citadel-Station-13/silicons-patch-13 
fixes cyborg sprint
 2020-10-07 15:07:05 -07:00
silicons
eda0eda754 Update movement.dm 2020-10-07 10:46:00 -07:00
shellspeed1
2c59a5b9f8 more spelling 2020-10-06 17:36:57 -07:00
CitadelStationBot
89cfde9c34 Automatic changelog generation for PR #13526 [ci skip] 2020-10-06 19:06:12 -05: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
CitadelStationBot
bc4559152d Automatic changelog generation for PR #13496 [ci skip] 2020-10-06 19:05:09 -05:00
silicons
56a7499cef Merge pull request #13496 from Detective-Google/deadchat-kablooey 
allows players in deadchat to see explosions
 2020-10-06 17:05:06 -07:00
CitadelStationBot
d2ba113977 Automatic changelog generation for PR #13498 [ci skip] 2020-10-06 19:04:42 -05: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
CitadelStationBot
772d89431e Automatic changelog generation for PR #13500 [ci skip] 2020-10-06 19:04:25 -05:00
silicons
6d5cee7775 Merge pull request #13500 from LetterN/map-updates 
Updates Lambda station
 2020-10-06 17:04:22 -07:00
CitadelStationBot
9bdf9f497b Automatic changelog generation for PR #13501 [ci skip] 2020-10-06 19:04:04 -05:00
silicons
3fa0bf37ff Merge pull request #13501 from Putnam3145/fix-firelocks 
Made holofirelocks work.
 2020-10-06 17:04:01 -07:00
CitadelStationBot
de4c6f7420 Automatic changelog generation for PR #13503 [ci skip] 2020-10-06 19:03:47 -05: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