shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,330 Commits 5 Branches 0 Tags
ab59a0d03597cb4fedd1ba283405ad529524d5bd
Commit Graph

1398 Commits

Author SHA1 Message Date
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice 
Paramed office on box + Surgery remodel
 2020-12-29 01:27:49 -07:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
MrJWhit
939d6b7ad8 goose barsign 2020-12-13 00:57:05 -05:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
Putnam3145
cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3 
re-allows angel species on magic mirrors
 2020-11-18 17:51:02 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
d0f41ffa83 Update mirror.dm 2020-11-07 00:35:27 -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
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
silicons
3fa0bf37ff Merge pull request #13501 from Putnam3145/fix-firelocks 
Made holofirelocks work.
 2020-10-06 17:04:01 -07:00
silicons
27ae95dd26 Merge pull request #13499 from Putnam3145/toilet-loot-fix 
Makes toilet loot not exist to cause bad GC bugs.
 2020-10-03 18:07:10 -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
Putnam
138794378d Made holofirelocks work. 2020-10-02 22:34:05 -07:00
Putnam
29213bbcbe ok i guess it has to be initialize 2020-10-02 17:39:53 -07:00
Putnam
3b21c31872 Makes water closet loot work and not cause bad GC bugs. 2020-10-02 16:56:21 -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
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2 
Adds craftable railings
 2020-10-01 03:13: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
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
Letter N
c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Putnam
8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
silicons
00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia 
heterochromia: you can select individual eye colours
 2020-09-27 00:01:00 -07:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Hatterhat
f8c1c829d7 maulers slam people very violently 2020-09-06 15:34:53 -05:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N
116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218) 
* fixes

* fix
 2020-08-25 20:58:20 +02:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items 
adds three t1 donator items
 2020-08-23 05:08:50 -07:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
silicons
397cdb6c03 Merge branch '13129' 2020-08-16 18:45:35 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
silicons
3e67fd11e8 Update chair.dm 2020-08-11 23:39:31 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
ancientpower
99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -05:00