Commit Graph
15459 Commits
Author SHA1 Message Date
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 7f80338a62 Merge pull request #6270 from Citadel-Station-13/upstream-merge-36958
[MIRROR] fixes revenant deadchat
2018-04-04 21:01:41 +00:00
deathride58andGitHub 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
fludd12andCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot 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 BrownandCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot 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
JordieandCitadelStationBot 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 BrownandCitadelStationBot 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
YPOQandCitadelStationBot 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
robbymandCitadelStationBot 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
JordieandCitadelStationBot 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 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 GinnaneandCitadelStationBot 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
ArmhulenandCitadelStationBot 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
kevinz000andCitadelStationBot 4fb2e612df Fixes bloodbath effects not working on people in crit (#36598)
Also some minor improvements to performance by caching the nearby mobs list once
2018-04-03 22:01:59 -05:00
kevinz000andGitHub 884f70d233 src. 2018-04-03 02:22:28 -07:00
kevinz000andGitHub 768864d24a looc 2018-04-03 02:22:07 -07:00
deathride58andGitHub 5dddb2db45 Merge pull request #6083 from Citadel-Station-13/upstream-merge-36149
[MIRROR] improves techwebs a bit
2018-04-03 08:16:59 +00:00
deathride58andGitHub edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
2018-04-03 08:16:11 +00:00
deathride58andGitHub a196e2c58e Merge pull request #6243 from Citadel-Station-13/upstream-merge-36907
[MIRROR] Unit tests don't start until after 10s of round time
2018-04-03 08:15:33 +00:00
deathride58andGitHub 1013f3d92e Merge pull request #6245 from Citadel-Station-13/upstream-merge-36490
[MIRROR] Archaeology...    .... Code Cleanup (One day I promise!)
2018-04-03 08:15:12 +00:00
deathride58andGitHub 2a8196f618 Merge pull request #6246 from Citadel-Station-13/upstream-merge-36855
[MIRROR] implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo
2018-04-03 08:14:43 +00:00
deathride58andGitHub 19b145393a Merge pull request #6244 from Citadel-Station-13/upstream-merge-36930
[MIRROR] Removes april fools pitch shifting on admin music
2018-04-03 08:14:27 +00:00
CitadelStationBotandPoojawa ca014a4815 [MIRROR] AI VOX Sound File Fixes (#6242)
* Merge pull request #36908 from Davidj361/voxFixes-4-1-2018

AI VOX Sound File Fixes

* AI VOX Sound File Fixes
2018-04-02 21:10:24 -05:00
CitadelStationBotandPoojawa c3e86ebc95 [MIRROR] Updates travis byond to 512.1418 (#6239)
* Merge pull request #36903 from vuonojenmustaturska/byondupd

Updates travis byond to 512.1418

* Updates travis byond to 512.1418
2018-04-02 21:09:52 -05:00
CitadelStationBot 16d67fa68c implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo 2018-04-02 19:46:01 -05:00
iksypandCitadelStationBot 496f73bc56 implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855)
* loyality

*fixed a bug that made coding relating to loyalty implants basically impossible

* did i say loyalty i meant mindshield

* and the .dme as well

this commit and last were webeditor but it should work
2018-04-02 19:46:01 -05:00
CitadelStationBot fb37429f49 Archaeology... .... Code Cleanup (One day I promise!) 2018-04-02 18:14:15 -05:00
Grandmother of 50andCitadelStationBot 2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490)
* Improves Arch Code

* defines and stack_traces null values

* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
CitadelStationBot 210d31b830 Removes april fools pitch shifting on admin music 2018-04-02 18:08:59 -05:00
orangesandCitadelStationBot b428142e39 Removes april fools pitch shifting on admin music 2018-04-02 18:08:58 -05:00