042fa8c5ff
Update choking.dm ( #37040 )
2018-04-10 16:03:22 -05:00
e0d7630c19
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
c2ff35d28f
Merge pull request #6325 from Citadel-Station-13/upstream-merge-37063
...
[MIRROR] Fixes swarming runtime
2018-04-09 16:39:10 -05:00
bdf2f65a8f
Fixes swarming runtime
2018-04-09 11:06:28 -05:00
2c275be1c1
Fixes an heirloom trait-related runtime that gets spammed in the logs ( #37036 )
...
* honk
* return
* Update negative.dm
* Update _trait.dm
2018-04-09 04:52:40 -05:00
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
38ae8beefc
[READY]AI latejoins
2018-04-06 00:44:31 -05:00
8ad42c519a
Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928
...
[MIRROR] Removes @
2018-04-04 21:12:45 +00:00
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
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
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
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
5614da1d3b
Merge pull request #36945 from KorPhaeron/aprilfools
...
Removes april fools from heirlooms
2018-04-03 22:03:04 -05:00
20f7370ea3
Removes @ ( #36928 )
2018-04-03 22:02:55 -05:00
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
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
7de2934a26
Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834
...
[MIRROR] Removes advanced darkness
2018-04-02 06:58:18 -05:00
022ac2e6c3
Merge pull request #6178 from Citadel-Station-13/shit
...
sanity
2018-04-01 19:51:39 -05:00
dd579e35bc
Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
...
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
f7be23e78a
Merge branch 'master' into upstream-merge-36442
2018-04-01 19:50:37 -05:00
24d4b310cd
Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
...
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
c47a034069
Merge pull request #36834 from KorPhaeron/darkness2
...
Removes advanced darkness
2018-04-01 00:08:53 -05:00
fa64b72ea6
Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781
...
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
2018-03-31 18:39:15 -05:00
2ca217388f
Merge pull request #6165 from Citadel-Station-13/upstream-merge-36748
...
[MIRROR] Tweaks stats of 4 virus symptoms
2018-03-31 06:20:54 -05:00
15cb1258dc
Merge pull request #6163 from Citadel-Station-13/upstream-merge-36457
...
[MIRROR] Fixes phobia word recognition
2018-03-31 06:20:33 -05:00
dcaf3e2575
Merge pull request #6148 from Citadel-Station-13/upstream-merge-36750
...
[MIRROR] spelling error fixed.
2018-03-31 06:16:00 -05:00
0b7f816033
Added a new ability to sentient diseases
2018-03-31 06:14:54 -05:00
b26868a6b7
Get_Flat_Human_Icon no longer draws asses that nobody wants ( #36781 )
...
* Argument to limit excess icon work
* 50% less icon for your icon
* 75% less icon for your icon
* Correction
* statics the list, tweaks a default arg
* Cardinal argument list
* correct GLOB name
2018-03-31 06:13:28 -05:00
84ac06c986
Yeah no
2018-03-31 04:07:29 -07:00
6b48740f7e
Tweaks stats of 4 virus symptoms ( #36748 )
...
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
2018-03-28 19:21:05 -05:00
8b1cf5bfce
Fixes phobia word recognition ( #36457 )
...
* fix
* Update phobia.json
* add plural detection
2018-03-28 13:43:09 -05:00
2d8b007086
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
cb8f3e9293
>happend
2018-03-28 12:17:14 -05:00
8ec16df2e4
Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety ( #36426 )
...
* Adds some more traits
* April Fools' heirlooms
* Fixes the detective sound
* Refactor to use signals
2018-03-28 12:15:06 -05:00
d351caf92f
Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663
...
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
2018-03-27 17:51:35 +00:00
ebc51d94bf
Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
...
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
0f39d85a80
Fixes slimeperson traits ( #36663 )
2018-03-26 21:12:07 -05:00
303272319a
[READY]pathfinding circuitry upgrade ( #36398 )
...
* all in one
* fixfixfix
* uhhhh
* demuxdemuxdemuxdemux
* wire eriw
* icon noci
* tihsxifixshit
* rewopower
* fixif
* screeneercs
* returnruter
2018-03-26 11:01:22 -05:00
4773743eab
Fixes wet floor scaling ( #36697 )
...
* Fixes wet floor scaling
* Meh lets not
2018-03-26 10:49:42 -05:00
29a4af95c2
[MIRROR] Fixes imaginary friend trauma ( #6104 )
...
* Fixes imaginary friend trauma (#36647 )
* Fixes imaginary friend trauma
2018-03-26 04:29:31 -05:00
b8cc4e2d76
[MIRROR] Fixes Mush Punch ( #6102 )
...
* Fixes Mush Punch (#36631 )
* sometimes you just gotta own up to your mistakes :(
* I'm gonna be the best friend you have to ask for yourself to be the most things I can tell
Real shit
* Fixes Mush Punch
2018-03-26 04:28:53 -05:00
4f254f181f
[MIRROR] Sintouched antag datums ( #6096 )
...
* Sintouched antag datums (#36561 )
* Sintouched stuff
* hudz
* These are boring and when they happen they happen en masse so let's just list them
* undefs
* Sintouched antag datums
2018-03-26 04:19:49 -05:00
69ddb63bb4
[MIRROR] Fixes asclepius rod runtime ( #6074 )
...
* Fixes asclepius rod runtime (#36595 )
* Fixes asclepius rod runtime
* isanimal
* Fixes asclepius rod runtime
2018-03-22 19:30:09 -05:00
9eb6eb6225
[READY] ~SPELL CARDS~, homing projectiles, and more!
2018-03-22 15:40:07 -05:00
79911d330a
Being happy no longer makes you obese. ( #36565 )
...
* D O U B L E N E G A T I V E
* jesus
2018-03-21 15:35:33 -05:00
4ad2b2975a
[MIRROR] Fixes some more trauma bugs ( #6039 )
...
* Fixes some more trauma bugs (#36487 )
* fixes some more trauma bugs
* Update brain_trauma.dm
* Update brain_item.dm
* Fixes some more trauma bugs
2018-03-21 12:50:22 -05:00
9517e3ad2e
Merge pull request #5990 from Poojawa/digileg-runtime
...
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
6cd994d342
[MIRROR] Colour fix ( #6024 )
...
* Colour fix
* Update ai_laws.dm
2018-03-19 22:18:28 -05:00
9f182d89ed
[MIRROR] Distinguishes law types by colour ( #6022 )
...
* Distinguishes law types by colour
* merge conflict
2018-03-19 22:17:24 -05:00
7b3b1f65ec
[MIRROR] Adds two new intermediate beaker types to chemistry ( #6018 )
...
* Adds two new intermediate beaker types to chemistry
* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE
* Update all_nodes.dm
2018-03-19 22:17:05 -05:00
Alomga