shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph

4135 Commits

Author SHA1 Message Date
Fabian b99b9f65d6 Revert "god why am i doing it this way instead of just looking at end changes" 
This reverts commit aa6402427b.
 2021-03-05 21:19:53 +01:00
Fabian aa6402427b god why am i doing it this way instead of just looking at end changes 
im going through every single commit im retarded
 2021-03-05 21:11:09 +01:00
Fabian dbabbb1062 objectives 
hrnrghghgh
 2021-03-05 20:31:57 +01:00
Fabian 7f38564838 i can't believe kevin made me code 
im taking severe offense to this
 2021-03-05 19:55:53 +01:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N 2542fe05e9 mapmerge update + mats properly work 2021-03-05 15:38:35 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Lin cf048e1f65 Merge pull request #14354 from Putnam3145/volume-change 
Makes ash storm volume quieter
 2021-03-04 13:32:29 -06:00
Letter N a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam 235f916c61 Makes ash storm volume quieter. 2021-03-02 12:32:14 -08:00
Timothy Teakettle fa765ec4c3 nope 2021-03-01 20:58:21 +00:00
zerothebigboy 165966ffeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
 2021-02-28 22:13:00 -05:00
silicons e7981c0a44 changes 2021-02-28 01:02:18 -07:00
silicons 519c694252 removes combat mode effects 2021-02-28 00:44:56 -07:00
silicons 70c828f74d changes 2021-02-28 00:27:14 -07:00
silicons 70b8d833c0 changes 2021-02-28 00:00:14 -07:00
kiwedespars 081b669345 Merge branch 'master' into we-hate-cqc 2021-02-27 22:19:16 -08:00
kiwedespars 123f686e7f makes chokehold mute 2021-02-27 22:18:44 -08:00
Putnam 311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
Letter N 5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates 
Pain emote is now added to getting wounded! As well as more pain sounds
 2021-02-21 14:56:26 -07:00
silicons ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
kiwedespars de69e9996a nerfs cqc 2021-02-21 13:10:08 -08:00
zerothebigboy d0beec1364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-19 09:07:27 -05:00
Putnam cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot 69af7d35f8 Update remote_materials.dm 2021-02-18 15:16:40 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
dzahlus 2f6527800e monke getting wounded *pain's lmao 2021-02-18 15:55:23 +01:00
Lin 3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06:00
Dan-Neposh 2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
Dan-Neposh ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
silicons e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
SandPoot 4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
zerothebigboy a5de2a6620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-14 10:42:59 -05:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Lin 98736a7a37 Merge pull request #14207 from TyrianTyrell/master 
Multilingual fix? (Has since been tested.)
 2021-02-13 16:41:10 -06:00
Hatterhat c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
TyrianTyrell a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
Letter N 5b0a1077f4 Modular Cmp Updates 2021-02-12 18:29:00 +08:00
Letter N a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00