shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,426 Commits 5 Branches 0 Tags
38ae8beefce93d35c7ffb99f0a8cc034e7632ddc
Commit Graph

15426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
LetterJay
49fd917fee Merge pull request #6252 from Citadel-Station-13/kevinz000-patch-4 
looc now obeys ooc bans
 2018-04-05 07:35:43 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
deathride58
f780b4dc99 Merge pull request #6272 from Citadel-Station-13/kevinz000-patch-1 
Readds handholding
 2018-04-05 00:03:59 +00:00
kevinz000
3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00
kevinz000
f94ff21968 readds handholding 2018-04-04 14:24:57 -07:00
deathride58
f4ebb8d2e9 Merge pull request #6228 from Citadel-Station-13/kevinz000-patch-1 
Nerfs beam rifle effectiveness vs blob
 2018-04-04 21:20:12 +00:00
deathride58
4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
deathride58
a8a7754b22 Merge pull request #6256 from Citadel-Station-13/upstream-merge-36598 
[MIRROR] Fixes bloodbath effects not working on people in crit
 2018-04-04 21:16:21 +00:00
deathride58
5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
 2018-04-04 21:15:55 +00:00
deathride58
63ed2b0069 Merge pull request #6259 from Citadel-Station-13/upstream-merge-36711 
[MIRROR] Fixed sometimes using items on full storage items
 2018-04-04 21:14:13 +00:00
deathride58
c702e9b097 Merge pull request #6260 from Citadel-Station-13/upstream-merge-36927 
[MIRROR] Adds more moth names to prevent duplicate random names
 2018-04-04 21:13:23 +00:00
deathride58
8ad42c519a Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928 
[MIRROR] Removes @
 2018-04-04 21:12:45 +00:00
deathride58
ef7b79eea7 Merge pull request #6262 from Citadel-Station-13/upstream-merge-36945 
[MIRROR] Removes april fools from heirlooms
 2018-04-04 21:12:26 +00:00
deathride58
af8862bd78 Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867 
[MIRROR] Fixes 0 value not being saved in constant memory circuits
 2018-04-04 21:11:44 +00:00
deathride58
cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645 
[MIRROR] Fixes mannitol not curing minor brain traumas
 2018-04-04 21:11:28 +00:00
deathride58
3b35c63027 Merge pull request #6265 from Citadel-Station-13/upstream-merge-36932 
[MIRROR] Fixes asphyxiation disease activating early and ignoring transmission
 2018-04-04 21:11:07 +00:00
deathride58
fdea6d88aa Merge pull request #6266 from Citadel-Station-13/upstream-merge-36897 
[MIRROR] Fixes errors with making temp rank changes before permanent ones
 2018-04-04 21:10:47 +00:00
deathride58
e6f411ae5d Merge pull request #6268 from Citadel-Station-13/upstream-merge-36969 
[MIRROR] move enforce_human_authority check before species.before_equip_job()
 2018-04-04 21:04:30 +00:00
deathride58
3eec79f992 Merge pull request #6269 from Citadel-Station-13/upstream-merge-36929 
[MIRROR] Fixes chem macros with trailing ;
 2018-04-04 21:02:22 +00:00
deathride58
5f4509123c Merge pull request #6271 from Citadel-Station-13/upstream-merge-36521 
[MIRROR] Burning ores (from either fire or lava) now yields materials at a decreased rate.
 2018-04-04 21:02:05 +00:00
deathride58
7f80338a62 Merge pull request #6270 from Citadel-Station-13/upstream-merge-36958 
[MIRROR] fixes revenant deadchat
 2018-04-04 21:01:41 +00:00
deathride58
e930b98beb Update dance_machine.dm 2018-04-04 16:59:18 -04:00
CitadelStationBot
4d0b9543a3 Burning ores (from either fire or lava) now yields materials at a decreased rate. 2018-04-04 12:00:57 -05:00
fludd12
fc9b02cbbb Burning ores (from either fire or lava) now yields materials at a decreased rate. (#36521) 
* Burning ores (from either fire or lava) now yields materials at a decreased rate.

* Randomizes the returns!
 2018-04-04 12:00:57 -05:00
CitadelStationBot
3f3fed33f9 fixes revenant deadchat 2018-04-04 09:07:06 -05:00
vuonojenmustaturska
4b505112fc fixes revenant deadchat 2018-04-04 09:07:06 -05:00
CitadelStationBot
2b7d91481a Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
Jordan Brown
057d10f654 Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
CitadelStationBot
6912680b2f move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
vuonojenmustaturska
77e51603d4 move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
CitadelStationBot
d7754f90db Fixes errors with making temp rank changes before permanent ones 2018-04-03 23:51:45 -05:00
Jordie
00f5f70b1b Fixes errors with making temp rank changes before permanent ones (#36897) 
* fixes errors with making temp rank changes before permanent ones

* adds parenthesis
 2018-04-03 23:51:45 -05:00
CitadelStationBot
59ebf58c2b Fixes asphyxiation disease activating early and ignoring transmission 2018-04-03 23:46:28 -05:00
Jordan Brown
3c7d2c0ab9 Merge pull request #36932 from SailorDave/asphyxiation-fix 
Fixes asphyxiation disease activating early and ignoring transmission
 2018-04-03 23:46:28 -05:00
CitadelStationBot
8a296900c2 Fixes mannitol not curing minor brain traumas 2018-04-03 22:03:21 -05:00
YPOQ
1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) 
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
 2018-04-03 22:03:20 -05:00
CitadelStationBot
586ce24177 Fixes 0 value not being saved in constant memory circuits 2018-04-03 22:03:12 -05:00
robbym
1e34269e0c Fixes 0 value not being saved in constant memory circuits (#36867) 
* Fixes 0 value not being saved in constant memory circuits

* Fixes 0 value not being loaded in constant memory circuits

* Switched to isnull proc for null checks
 2018-04-03 22:03:12 -05:00
CitadelStationBot
6a0ea296b1 Removes april fools from heirlooms 2018-04-03 22:03:04 -05:00
Jordie
5614da1d3b Merge pull request #36945 from KorPhaeron/aprilfools 
Removes april fools from heirlooms
 2018-04-03 22:03:04 -05:00
CitadelStationBot
41a4708677 Removes @ 2018-04-03 22:02:55 -05:00
Jordan Brown
20f7370ea3 Removes @ (#36928) 2018-04-03 22:02:55 -05:00
CitadelStationBot
b603b48f21 Adds more moth names to prevent duplicate random names 2018-04-03 22:02:47 -05:00
Jordan Brown
eb5936c48b Merge pull request #36927 from 81Denton/moff-name-variety 
Adds more moth names to prevent duplicate random names
 2018-04-03 22:02:47 -05:00
CitadelStationBot
1ff56032d6 Fixed sometimes using items on full storage items 2018-04-03 22:02:39 -05:00
John Ginnane
80fee95dab Fixed sometimes using items on full storage items (#36711) 
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
 2018-04-03 22:02:39 -05:00
CitadelStationBot
95df3010ba podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) 2018-04-03 22:02:17 -05:00
Armhulen
fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733) 
* yeeeeeeeeeeap

* i turned myself into a commit morty!

* I'M COMMIT RICKKKKKKKK

* tinydwarfy was an inside job

* *reels in pain* you KNOW I DON'T LIKE PISTACHIOS

* WOO
 2018-04-03 22:02:17 -05:00
CitadelStationBot
e94c4ed24d Fixes bloodbath effects not working on people in crit 2018-04-03 22:02:00 -05:00