shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,933 Commits 5 Branches 0 Tags
f922663aaf8fa346e28cdafbb96cbfcac86c3f73
Commit Graph

2687 Commits

Author SHA1 Message Date
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
silicons
06771cd47a Merge pull request #15189 from zeroisthebiggay/minkraft 
a new maintenance ambience
 2021-09-28 00:15:16 -07:00
zeroisthebiggay
931ffd428f Update sound.dm 2021-09-20 23:10:08 -04:00
zerothebigboy
baf4b90e0c lmao i love coding 2021-09-20 22:58:39 -04:00
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
silicons
849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00
kiwedespars
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152) 
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-09-17 12:54:02 +02:00
silicons
abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right 
Mafia updates
 2021-09-13 15:08:50 -07:00
Putnam3145
99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
silicons
e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners 
prisoners - aka ports prisoners from tg hell yeah
 2021-09-12 20:59:12 -07:00
silicons
4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade 
Reworks supermatter gas output to be less cascade-y, more risky
 2021-09-12 20:58:48 -07:00
LetterN
791da1b9b4 mafia update. 2021-09-11 11:38:15 +08:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
silicons
fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern 
ports various tg armor resprites and some such
 2021-09-10 00:16:54 -07:00
Putnam3145
cc2471cf7f Reworked supermatter gas output 
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
 2021-09-09 13:51:22 -07:00
zerothebigboy
5a8a069cd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/mob/clothing/suit_digi.dmi
#	icons/obj/clothing/suits.dmi
 2021-09-09 04:49:30 -04:00
LetterN
6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
LetterN
c25dc84da0 what the cat doing with the yarn dependencies?? 2021-09-08 09:25:38 +08:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
9f4f099880 gommit 2021-09-02 03:05:23 -04:00
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight 
Ports Inventory Outlines
 2021-08-26 21:41:25 -07:00
silicons
13130b3ee6 Merge pull request #15015 from keronshb/gremlinport 
Gremlin Port
 2021-08-26 21:40:59 -07:00
silicons
841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos 
Port of randomized planet atmos
 2021-08-26 21:39:23 -07:00
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
keronshb
1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
Timothy Teakettle
74595b2845 Update loadout.dm 2021-08-16 18:01:54 +01:00
keronshb
45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00
silicons
c37f2ca739 Merge pull request #14961 from Putnam3145/supermatter-auxgm 
Makes supermatter properties auxgm-based
 2021-08-11 02:01:05 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
977d129de6 Shuttle lights are back on 2021-07-30 23:45:55 +03:00
Artur
dc40dfca81 goddamn stupid runtimes 2021-07-30 01:24:43 +03:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
765dea059c added bee's paranoid auxmos function 
cause it's necessary
 2021-07-25 18:08:40 -07:00
Putnam3145
0b55928f9b Makes supermatter properties auxgm-based 2021-07-20 22:46:33 -07:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating 
adds a neutral trash eating quirk
 2021-07-18 15:07:29 -07:00
silicons
b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes 
Crafting menu cleaning up
 2021-07-18 15:07:12 -07:00
silicons
7cd89978f2 Merge pull request #14933 from keronshb/stripdcport 
[PORT]  Stripping a disconnected player will tell them when they come back (+Lazynull)
 2021-07-18 15:05:48 -07:00
Artur
b71a6497e8 Crafting menu fixes and such 
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
 2021-07-16 03:23:02 +03:00
SandPoot
6445cfdd9d Removes spontaneous vore and reorganizes buttons 2021-07-15 17:32:03 -03:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
timothyteakettle
39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
keronshb
c7d1c9d8e8 Ports Stripping log when dc'd 2021-07-07 21:12:44 -04:00
Putnam3145
f1bcbc2573 Makes diagonal movement euclidean 2021-07-01 12:09:39 -07:00
silicons
a73ca4be46 scope creep lmao 2021-06-28 12:29:18 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7 
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
 2021-06-27 13:04:29 -07:00