shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,222 Commits 5 Branches 0 Tags
f8caa2dd78b77e4666d224eb24c99befbcaf77fa
Commit Graph
8222 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041 
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
 2017-10-30 22:11:33 -04:00
LetterJayandGitHub 49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJayandGitHub ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
LetterJayandGitHub 636e2a6d90 Update grenade.dm 2017-10-30 17:32:08 -05:00
kevinz000andCitadelStationBot 93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
CitadelStationBot 5deb7be205 New ambience for ash storms 2017-10-30 15:22:23 -05:00
Emmett GainesandCitadelStationBot 6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
CitadelStationBot 0f02555a88 Makes rollerbeds normal-sized items 2017-10-30 15:09:49 -05:00
Jordan BrownandCitadelStationBot f6ebb15fbd Merge pull request #32134 from Anonmare/patch-8 
Makes rollerbeds normal-sized items
 2017-10-30 15:09:49 -05:00
CitadelStationBot 83614862d2 Ignore verb now also shows ghost names 2017-10-30 15:06:37 -05:00
Jordan BrownandCitadelStationBot 909f1ba244 Merge pull request #32222 from AnturK/ignoreprovement 
Ignore verb now also shows ghost names
 2017-10-30 15:06:37 -05:00
CitadelStationBot 517a78f875 Fixes rollies not being effective 2017-10-30 15:01:24 -05:00
Jordan BrownandCitadelStationBot 2855553b4e Merge pull request #32146 from PKPenguin321/patch-20 
Fixes rollies not being effective
 2017-10-30 15:01:24 -05:00
CitadelStationBot ea5f6f5051 Fixes webhook tagging when tree is found anywhere 2017-10-30 14:58:11 -05:00
Jordan BrownandCitadelStationBot d9bb2bc4e6 Merge pull request #32157 from JJRcop/patch-2 
Fixes webhook tagging when tree is found anywhere
 2017-10-30 14:58:11 -05:00
CitadelStationBot 5db7212d01 Removes statues from the gold slime pool 2017-10-30 14:53:56 -05:00
jughuandCitadelStationBot b6fea33316 Removes statues from the gold slime pool (#32123) 
* Update statue.dm

* Update statue.dm
 2017-10-30 14:53:56 -05:00
CitadelStationBot f7b2d13827 Meteor gating tweaks 2017-10-30 14:51:44 -05:00
Jordan BrownandCitadelStationBot ba1d3fd2c2 Merge pull request #32150 from MrStonedOne/patch-442 
Meteor gating tweaks
 2017-10-30 14:51:44 -05:00
CitadelStationBot da9df182ee Fixes latejoin/mulligan traitors. 2017-10-30 14:50:34 -05:00
Jordan BrownandCitadelStationBot 3973e94e3f Merge pull request #32191 from AnturK/latetraitorfixup 
Fixes latejoin/mulligan traitors.
 2017-10-30 14:50:33 -05:00
CitadelStationBot 6fbe8e2fce fixes clockcults appearing as grey box on sechuds until they reequip their id 2017-10-30 14:42:17 -05:00
Jordan BrownandCitadelStationBot a9d440c457 Merge pull request #32210 from kevinz000/patch-361 
fixes clockcults appearing as grey box on sechuds until they reequip their id
 2017-10-30 14:42:17 -05:00
CitadelStationBot 1e2b1202cd Fixes mech recharger integrity bar 2017-10-30 14:41:08 -05:00
Jordan BrownandCitadelStationBot 4b0362e208 Merge pull request #32209 from YPOQ/mechrechargerfix 
Fixes mech recharger integrity bar
 2017-10-30 14:41:08 -05:00
CitadelStationBot 93fb4b751b Fixes cyborg upgrades not applying to held items 2017-10-30 14:40:57 -05:00
Jordan BrownandCitadelStationBot b859a3f1aa Merge pull request #32211 from YPOQ/borgupgradefix 
Fixes cyborg upgrades not applying to held items
 2017-10-30 14:40:57 -05:00
CitadelStationBot 5d42e5679d fixes radios being perma-stuck on when emped 2017-10-30 14:38:47 -05:00
kevinz000andCitadelStationBot 0efaf92b6f fixes radios being perma-stuck on when emped (#32212) 
* fix radio emps

* woops forgot something!

* Update headset.dm
 2017-10-30 14:38:46 -05:00
CitadelStationBot 800311c238 fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting. 2017-10-30 14:37:37 -05:00
Jordan BrownandCitadelStationBot b6343c813b Merge pull request #32215 from kevinz000/patch-363 
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
 2017-10-30 14:37:37 -05:00
CitadelStationBot 48bdbd883b Deterministic output slots for smartfridges 2017-10-30 14:35:26 -05:00
vuonojenmustaturskaandCitadelStationBot 5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
CitadelStationBot 177319f8bc Updated clownbox sprite to better match others. 2017-10-30 14:35:17 -05:00
Jordan BrownandCitadelStationBot d615ecb340 Merge pull request #32223 from Mercenaryblue/Clown_Box_Sprite 
Updated clownbox sprite to better match others.
 2017-10-30 14:35:17 -05:00
Ashe HiggsandCitadelStationBot 0c4c4dc1f2 You can now hide grenades in plushies 2017-10-30 14:34:01 -05:00
CitadelStationBot 21e934153f Fixes old simple animal humanoid issues 2017-10-30 06:50:04 -05:00
bawhoppenandCitadelStationBot f8bd9ecf9c Fixes old simple animal humanoid issues (#32214) 
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
 2017-10-30 06:50:04 -05:00
LetterJayandGitHub 241d2d88e6 Merge pull request #3688 from Citadel-Station-13/upstream-merge-32156 
[MIRROR] Fixes TakeComponent
 2017-10-30 07:11:14 -04:00
LetterJayandGitHub b6a04b6649 Merge pull request #3689 from Citadel-Station-13/CharacterCreation 
Fixes character issues on creation
 2017-10-30 07:02:15 -04:00
LetterJayandGitHub ed2208a7ea Merge pull request #3687 from Michiyamenotehifunana/CRITICAL-SPRITER-CRAP-NERFS 
CRITICAL BALANCE FIXES TO CITADEL'S GUNS
 2017-10-30 06:33:15 -04:00
LetterJay e0cbc7b9a2 Fixes character issues on creation 2017-10-30 05:32:06 -05:00
Michiyamenotehifunana 9ea376dc81 fixes soporifics having the old two shot value 
SSSSSH JUST PRETEND IT WAS A MISTAKE
 2017-10-30 17:33:01 +08:00
CitadelStationBot c7bfa28dce Fixes TakeComponent 2017-10-30 03:53:00 -05:00
Jordan BrownandCitadelStationBot 47f88be07f Fixes TakeComponent (#32156) 
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
 2017-10-30 03:53:00 -05:00
Michiyamenotehifunana d0a28fcd62 NERF EVERYTHING 
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
 2017-10-30 15:01:37 +08:00
LetterJayandGitHub 969f92fb58 Delete nudge.py 2017-10-30 01:48:48 -05:00
LetterJayandGitHub fba46cd0e5 Delete server_tools.dm 2017-10-30 01:48:42 -05:00
LetterJayandGitHub f1002a7109 Merge pull request #3672 from Citadel-Station-13/upstream-merge-32206 
[MIRROR] Fixes map_config validation
 2017-10-30 00:00:31 -04:00
LetterJayandGitHub 1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns 
Recolorable Guns and more ballistics for Security
 2017-10-29 23:43:20 -04:00