Commit Graph

12455 Commits

Author SHA1 Message Date
Grandmother of 50
43e0079981 Provides more control over uplink surplus chances. (#36983)
Cant wait for the epic balance prs that people will fight in
2018-04-11 05:16:32 -05:00
Tad Hardesty
ae16d62178 Fix double-fullstop in the jukebox's description (#37088) 2018-04-11 05:15:19 -05:00
Robustin
a79a168d2c Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 05:08:47 -05:00
oranges
f01620acef Merge pull request #36693 from kevinz000/patch-471
Slightly bandaid fix for ntnet json/xorencrypt runtimes
2018-04-11 05:02:19 -05:00
iksyp
5a06fd98ed Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
2018-04-11 04:59:57 -05:00
pigeons
7a07c101df AI requires silicon exp instead of crew exp for roundstart role (#36469)
* Ai requires silicon xp

* Reverses byond age change
2018-04-11 04:54:32 -05:00
YPOQ
42372b8d04 Fixes eminences not being recognized as servants of ratvar (#37070)
* Fixes eminences not being recognized as servants of ratvar

* Readds istype check
2018-04-10 20:21:37 -05:00
deathride58
4063781baf Merge pull request #6332 from Citadel-Station-13/upstream-merge-37040
[MIRROR] Fixes Acute Respiratory Distress Syndrome not having a treshhold description
2018-04-11 01:04:16 +00:00
deathride58
d6c2e4dd56 Merge pull request #6336 from Citadel-Station-13/upstream-merge-37050
[MIRROR] Fix fullscreens added to clientless mobs not stretching properly
2018-04-11 01:03:23 +00:00
deathride58
4b87170139 Adds "Man up" verb for admins. (#6296)
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
2018-04-10 17:34:45 -07:00
Jordan Brown
0a9ca8b073 Merge pull request #37050 from AutomaticFrenzy/patch/fullscreen-cloning
Fix fullscreens added to clientless mobs not stretching properly
2018-04-10 19:23:28 -05:00
oranges
4b34949340 Merge pull request #37071 from kevinz000/patch-480
Fixes constants chips getting scrambled by EMPs
2018-04-10 16:22:49 -07:00
Bjorn Neergaard
f56e139fda Use a rust DLL for logging (#36858)
By moving our logging to a DLL we see a drop in CPU/real time of 2-3 orders of magnitude. This is due to BYOND opening and closing file handles on every write, causing incredible amounts of unneeded overhead. The logging library also handles timestamps for us, further increasing performance gains.

This library will also allow for further offloading in the future, such as completely replacing file2text() and friends.

A pre-compiled DLL is bundled, but Linux users will have to compile manually. Directions can be found at the rust-g repo.

Log output is enhanced with millisecond time stamps:

[2018-04-01 15:56:23.522] blah blah blah

This includes runtimes as well, which benefit from the same timestamp improvements and no longer have hacky splitting code to add their own timestamps.

Log shutdown is handled in a dedicated proc called as late as possible, as rust-g integration expands this will be factored out into a generic native code shutdown proc.
2018-04-10 17:02:44 -05:00
Alomga
042fa8c5ff Update choking.dm (#37040) 2018-04-10 16:03:22 -05:00
deathride58
567204416b Merge branch 'master' into upstream-merge-36974 2018-04-10 07:48:12 +00:00
deathride58
f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065
[MIRROR] Fixes escape pods not getting to their default destination
2018-04-10 07:47:00 +00:00
deathride58
5669e6a0a1 Merge branch 'master' into upstream-merge-36953 2018-04-10 07:21:55 +00:00
deathride58
9647de2806 Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788
[MIRROR] Fixed paperbin dropping and fingerprints
2018-04-10 07:20:33 +00:00
deathride58
4cea1feb1b Update vr_sleeper.dm 2018-04-10 03:16:28 -04:00
deathride58
96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJay
dab96582bd Merge pull request #6306 from Citadel-Station-13/upstream-merge-37002
[MIRROR] Fixes slime latching
2018-04-09 16:40:14 -05:00
LetterJay
d1067b4271 Merge pull request #6329 from Citadel-Station-13/upstream-merge-36571
[MIRROR] Mark appearance_flags and sight as bitflags for VV
2018-04-09 16:39:59 -05:00
LetterJay
7d93dec924 Merge pull request #6327 from Citadel-Station-13/upstream-merge-36915
[MIRROR] Detective Scanner Fixes
2018-04-09 16:39:46 -05:00
LetterJay
80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072
[MIRROR] Fix an error message grammer
2018-04-09 16:39:28 -05:00
LetterJay
c2ff35d28f Merge pull request #6325 from Citadel-Station-13/upstream-merge-37063
[MIRROR] Fixes swarming runtime
2018-04-09 16:39:10 -05:00
LetterJay
859cf53869 Merge pull request #6324 from Citadel-Station-13/upstream-merge-37059
[MIRROR] Makes spacemove check location.
2018-04-09 16:38:57 -05:00
LetterJay
8433e7b154 Merge pull request #6322 from Citadel-Station-13/upstream-merge-37042
[MIRROR] Fixes underlying area grabbing subtypes
2018-04-09 16:38:32 -05:00
LetterJay
ba03df8c86 Merge pull request #6321 from Citadel-Station-13/upstream-merge-37053
[MIRROR] Fixes overflow role latejoin
2018-04-09 16:38:14 -05:00
LetterJay
60a72311a7 Merge pull request #6320 from Citadel-Station-13/upstream-merge-37036
[MIRROR] Fixes an heirloom trait-related runtime that gets spammed in the logs
2018-04-09 16:37:54 -05:00
LetterJay
6e89bdb737 Merge pull request #6316 from Citadel-Station-13/upstream-merge-37017
[MIRROR] Adds an are you sure dialog when pressing delete note.
2018-04-09 16:36:53 -05:00
LetterJay
954f1b0655 Merge pull request #6315 from Citadel-Station-13/kevinz000-patch-3
>wiped my flavortext accidently
2018-04-09 16:36:27 -05:00
LetterJay
294f1fdf45 Merge pull request #6314 from Citadel-Station-13/upstream-merge-37004
[MIRROR] Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan
2018-04-09 16:35:58 -05:00
LetterJay
a1f70e87d5 Merge pull request #6313 from Citadel-Station-13/upstream-merge-37033
[MIRROR] Makes revheads always show on top of the check antags listing.
2018-04-09 16:35:43 -05:00
LetterJay
674ab59397 Merge pull request #6312 from Citadel-Station-13/upstream-merge-37038
[MIRROR] Fixes a very common runtime involving incorrect proc signature on MakeSlippery overrides
2018-04-09 16:35:28 -05:00
LetterJay
944b74b95c Merge pull request #6311 from Citadel-Station-13/upstream-merge-36991
[MIRROR] Wrench Supermatter Shard to the ground
2018-04-09 16:35:10 -05:00
Tad Hardesty
126c610ccd Mark appearance_flags and sight as bitflags for VV 2018-04-09 14:15:24 -05:00
Davidj361
075a879343 Fixed paperbin dropping and fingerprints (#36788)
* Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper.

* Found a better fix

* Better operator

* Fixed fingerprints not being created upon paper bin interaction

* Review change
2018-04-09 14:14:13 -05:00
Davidj361
a25b8ec1be Detective Scanner Fixes (#36915)
* Fixed notes for detective's printed report

* Added alt-click functionality to clear logs for detective scanner

* Added a right click option to detective scanner to display logs without printing them

* Made the display function as an action button.

* Review changes done

* review changes

* review changes and a bad player message fix
2018-04-09 13:05:30 -05:00
Jordan Brown
f2717989c9 Fix an error message grammer 2018-04-09 12:48:58 -05:00
AnturK
bdf2f65a8f Fixes swarming runtime 2018-04-09 11:06:28 -05:00
AnturK
daeca4892e Makes spacemove check location. 2018-04-09 11:06:17 -05:00
Emmett Gaines
fd8a80d6cb Fixes escape pods not getting to their default destination 2018-04-09 05:24:55 -05:00
vuonojenmustaturska
0372a042ad Merge pull request #37042 from ninjanomnom/just-the-area-I-needed
Fixes underlying area grabbing subtypes
2018-04-09 05:22:42 -05:00
LetterJay
6fb9142fd1 Update vr_sleeper.dm 2018-04-09 05:17:48 -05:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
vuonojenmustaturska
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
Dax Dupont
37b8772f1c Adds an are you sure dialog when pressing delete note. (#37017)
* Adds an are you sure dialog when pressing delete note.

* The true is out there
2018-04-08 23:40:36 -05:00
kevinz000
cd38bccf01 why 2018-04-08 19:40:28 -07:00
Ashe Higgs
682db30746 Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan 2018-04-08 19:26:38 -05:00