shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,599 Commits 5 Branches 0 Tags
caa3d0a90df335f0e5be95705dd8fde589d21f03
Commit Graph
40599 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan-Neposh caa3d0a90d fixes a punctuation error in the guardian summon description 2021-01-26 11:26:19 -05:00
Dan-Neposh 87e9bb8e5c adds text announcing the end of the round for clockcult victory 2021-01-25 13:38:02 -05:00
Dan-Neposh 17f85d7d8d war golem, cyborg, soul vessel rites added, scarab scripture added 2021-01-25 05:22:20 -05:00
Dan-Neposh fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes 
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
 2021-01-22 00:04:04 -05:00
Dan-Neposh c38e5ca446 puts the eminence spire back in Reebe until the eminence vote changes 2021-01-21 23:46:21 -05:00
Dan-Neposh 48d8ffc9a7 reverts every change slowing down developement of this PR 2021-01-21 23:42:23 -05:00
Dan-Neposh 04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Dan-Neposh 93507cfb0a Merge remote-tracking branch 'origin/master' 2021-01-14 19:34:51 -05:00
Heretical LizardandGitHub 52d55b788a Merge pull request #19 from Citadel-Station-13/master 
fork update
 2021-01-14 20:06:59 -05:00
Dan-Neposh 6a7ec73889 Merge branch 'master' into clockcultrework_v2 2021-01-14 19:30:47 -05:00
Dan-Neposh 6ddfa8170f Adds a round ending sequence to Ratvar's spawn 
Along with its sounds + making the Neovgre cannon sound better. Audio courtesy of Dzahlus.
 2021-01-14 18:29:50 -05:00
Dan-Neposh ab5cffc360 Various edits in order to get this PR out finally 2021-01-14 12:56:55 -05:00
siliconsandGitHub 1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone 
Update engineering.dm
 2021-01-13 22:43:01 -07:00
SiliconMainandGitHub cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
CitadelStationBot 109b61df9a Automatic changelog generation for PR #14039 [ci skip] 2021-01-13 22:02:26 -06:00
siliconsandGitHub 28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start 
on the precipice of stickiness - sticky tape roundstart tech
 2021-01-13 21:02:23 -07:00
CitadelStationBot 23ad56d880 Automatic changelog generation for PR #13975 [ci skip] 2021-01-13 17:58:07 -06:00
siliconsandGitHub aa830b257a Merge pull request #13975 from zeroisthebiggay/paramed 
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
 2021-01-13 16:58:04 -07:00
CitadelStationBot 71c73905ce Automatic changelog generation for PR #14021 [ci skip] 2021-01-13 17:57:45 -06:00
siliconsandGitHub ce0891c2eb Merge pull request #14021 from DeltaFire15/emp-fuckeroni 
Fixes combat mode being permanently disabled under specific circumstances
 2021-01-13 16:57:42 -07:00
CitadelStationBot a78e723cc0 Automatic changelog generation for PR #14034 [ci skip] 2021-01-13 17:53:20 -06:00
siliconsandGitHub 82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix 
Fixes some edge cases regarding system corruption
 2021-01-13 16:53:17 -07:00
CitadelStationBot 925d9bfaba Automatic changelog generation for PR #14035 [ci skip] 2021-01-13 17:53:04 -06:00
siliconsandGitHub bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone 
Comments out hololocks
 2021-01-13 16:53:01 -07:00
CitadelStationBot a2ed0fddae Automatic changelog generation for PR #14032 [ci skip] 2021-01-13 17:50:53 -06:00
siliconsandGitHub c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat 
two toggled self-buffing spells that have no relation to any anime or video game in particular
 2021-01-13 16:50:50 -07:00
CitadelStationBot 50cd6cf393 Automatic changelog generation for PR #14025 [ci skip] 2021-01-13 17:48:08 -06:00
siliconsandGitHub 310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival 
More Synth tweaks
 2021-01-13 16:48:05 -07:00
CitadelStationBot cd0f5316a8 Automatic changelog generation for PR #14009 [ci skip] 2021-01-13 17:47:36 -06:00
siliconsandGitHub f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff 
Ports a bunch of wings from cit RP and fulpstation [Ready]
 2021-01-13 16:47:34 -07:00
DeltaFire 8b2044b407 another 2021-01-13 23:42:20 +01:00
DeltaFire 1a521b846f thanks 2021-01-13 23:39:36 +01:00
CitadelStationBot 1fd9bc8a50 Automatic changelog generation for PR #14015 [ci skip] 2021-01-13 12:40:07 -06:00
LinandGitHub 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs 
Tweaks some Synth damage stuff
 2021-01-13 18:40:03 +00:00
CitadelStationBot 57d1052a6a Automatic changelog generation for PR #14033 [ci skip] 2021-01-13 11:39:44 -06:00
DeltaFireandGitHub 6bdca6b8e4 Merge pull request #14033 from BlueWildrose/colormateys 
Adds Color Mates to every station (except Snaxi)
 2021-01-13 18:39:40 +01:00
CitadelStationBot eba8a16486 Automatic changelog generation for PR #14038 [ci skip] 2021-01-13 11:29:03 -06:00
DeltaFireandGitHub a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her 
an unatomic PR designed for maximizing maintainer suffering
 2021-01-13 18:28:59 +01:00
CitadelStationBot 9190fd4786 Automatic changelog generation for PR #14036 [ci skip] 2021-01-13 11:26:25 -06:00
DeltaFireandGitHub 7b02928558 Merge pull request #14036 from BlueWildrose/YouMadeMeDropMyCatgirl 
You will no longer unbuckle fireman-carried/piggybacked people when touching someone on help or grab intent
 2021-01-13 18:26:22 +01:00
DeltaFireandGitHub 16c8ff1e52 Merge pull request #14027 from MrJWhit/stops-code-from-seeping-into-ic-chat 
Port: "stops code from seeping into ic chat"
 2021-01-13 18:21:30 +01:00
DeltaFireandGitHub 84a95e5ddd Merge pull request #13994 from Citadel-Station-13/clowncar-safety 
hugboxes admin twitchplays clown car to not explode on death to avoid killing people (by default)
 2021-01-13 17:56:00 +01:00
CitadelStationBot a2ef243c6d Automatic changelog generation for PR #14019 [ci skip] 2021-01-13 10:55:04 -06:00
DeltaFireandGitHub 68557c84ae Merge pull request #14019 from timothyteakettle/stop-abusing-envys-knife 
species with NOTRANSSTING cannot have envy's knife used on them
 2021-01-13 17:54:57 +01:00
Hatterhat b36a1142fe on the precipice of stickiness 2021-01-12 16:58:20 -06:00
Hatterhat 508475d2a4 sabre off inhand fix 2021-01-12 16:36:02 -06:00
Hatterhat 2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Blue Wildrose 5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
SiliconMainandGitHub 2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00