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

16981 Commits

Author SHA1 Message Date
Putnam3145
cbb6020d49 Merge pull request #13553 from timothyteakettle/eye-sprites 
fixes eye sprites up
 2020-10-11 11:56:08 -07:00
Timothy Teakettle
89f2c53d88 ignore those reverts 2020-10-11 18:23:56 +01:00
Timothy Teakettle
86deb56d8d Revert "Revert "cleanup"" 
This reverts commit c770a90ccb.
 2020-10-11 17:11:34 +01:00
Timothy Teakettle
5e616f6297 Revert "Revert "finishing touches"" 
This reverts commit b650fa1761.
 2020-10-11 17:11:27 +01:00
Timothy Teakettle
5aff38597f Revert "Revert "Revert "Revert "customizable eyes"""" 
This reverts commit d852aacb78.
 2020-10-11 17:11:01 +01:00
Timothy Teakettle
d852aacb78 Revert "Revert "Revert "customizable eyes""" 
This reverts commit dedfdf224d.
 2020-10-11 16:55:07 +01:00
Timothy Teakettle
1f800064de Revert "Revert "Merge branch 'master' into eye-sprites"" 
This reverts commit d3a042deaa.
 2020-10-11 16:55:00 +01:00
Timothy Teakettle
dedfdf224d Revert "Revert "customizable eyes"" 
This reverts commit 9f3d745d80.
 2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9 Revert "Revert "eyes"" 
This reverts commit 4526fef297.
 2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297 Revert "eyes" 
This reverts commit 0c99b53c05.
 2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80 Revert "customizable eyes" 
This reverts commit dc70d17a1e.
 2020-10-11 16:54:09 +01:00
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
silicons
0c3020d4b8 Merge pull request #13349 from LetterN/git-updates 
Updates git, travis, and build tests
 2020-10-11 01:24:09 -07:00
Letter N
70a18ac0e3 shh - this makes travis work ^w^ 2020-10-11 15:58:54 +08:00
silicons
face07f532 Update supermatter.dm 2020-10-11 00:45:01 -07:00
BlackMajor
3e61ccb31a Merge pull request #13545 from Citadel-Station-13/silicons-patch-10 
It's time for HALLOWEEN!
 2020-10-11 19:45:23 +13:00
BlackMajor
313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00
BlackMajor
8be9e0aaad Merge pull request #13530 from Citadel-Station-13/silicons-patch-12 
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
 2020-10-11 18:43:49 +13:00
BlackMajor
d69e081b23 Merge pull request #13193 from Citadel-Station-13/silicons-patch-17 
buffsi ntegrated circuit medium screens
 2020-10-11 18:42:49 +13:00
BlackMajor
92b88925de Merge pull request #13542 from Citadel-Station-13/silicons-patch-15 
removes gibbing (blobattack) sound from *blorble so it always plays the far nicer attackblob sound instead
 2020-10-11 18:42:06 +13:00
BlackMajor
bf7d68884b Merge pull request #13510 from silicons/google 
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
 2020-10-11 18:39:10 +13:00
BlackMajor
9e909095a8 Merge pull request #13015 from silicons/combat_rework_experimental 
Combat v4: Redesigning Stamina, Sprint, Combat mode
 2020-10-11 18:38:53 +13:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
silicons
283ce51bc2 Merge pull request #13544 from DeltaFire15/portal-wackyness-fix 
Fixes a bunch of portal-related runtimes
 2020-10-10 22:16:49 -07:00
silicons
d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass 
Service+Plumbing QoL Pass 1:  Beakers, Belts, Plungers and Pipes
 2020-10-10 22:04:49 -07:00
silicons
c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres 
[READY] Energy Sabers - an elegant esword skin for a more civilized age
 2020-10-10 22:04:17 -07:00
silicons
792080ca3f Merge pull request #13533 from shellspeed1/jambalya- 
Face hugger jambalaya. Should be ready.
 2020-10-10 22:02:46 -07:00
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
silicons
f4cfc6c1e0 Update holidays.dm 2020-10-10 16:47:03 -07: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
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
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
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