Commit Graph

273 Commits

Author SHA1 Message Date
Jordan Brown 3f78bdcf59 Merge pull request #33606 from coiax/antaghud-on-end
Everyone gains antag HUD at round end
2017-12-21 14:24:49 -06:00
LetterJay 56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
deathride58 0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599
[MIRROR] Callback security and usr
2017-12-21 03:29:13 +00:00
deathride58 15233cbda3 Merge pull request #4460 from Citadel-Station-13/upstream-merge-33543
[MIRROR] Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK
2017-12-21 03:28:46 +00:00
LetterJay 00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan Brown e6e197c88a Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK (#33543)
* Adds NAMEOF and VARSET_CALLBACK

* Fix VARSET_CALLBACK

* Change names, add VARSET_LIST_CALLBACK

* Fix var names

* Additional macro safety. Update commen

* ImprovedName

* Fixing
2017-12-20 00:14:03 -06:00
LetterJay 8a1ed70888 Update roundend.dm 2017-12-20 00:08:37 -06:00
LetterJay e6cab75e71 NukeDatum 2017-12-19 19:22:03 -06:00
Jordan Brown fabfad270f Callback security and usr (#33599)
* Gonna regret writing this one day

* tmp -> temp

* Make PushUsr() a /world proc

* Callbacks now preserve usr

* Fixes PushUsr return value

* Fixes PushUsr invocations

* Update modifyvariables.dm

* Use weakrefs in callback user

* Further fixes

* Whoopsie
2017-12-18 21:41:33 -06:00
LetterJay 420bebf36f Update radio.dm 2017-12-17 15:56:29 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
AnturK 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58 d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 23:50:20 +00:00
deathride58 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
oranges 30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
[READY]Fixes beam rifles and flightsuits
2017-12-10 15:19:18 -06:00
Cruix 746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
Jordan Brown ae48e14876 Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell
Step backwards version of hex2num
2017-12-09 15:54:14 -06:00
deathride58 7cb2337c7f Merge pull request #4266 from Citadel-Station-13/upstream-merge-33345
[MIRROR] Fixes some broken random events
2017-12-08 18:47:22 +00:00
YPOQ f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -06:00
oranges ec0f2291c9 Merge pull request #33272 from tgstation/Cyberboss-patch-7
Speeds up some list helpers
2017-12-08 10:34:20 -06:00
Ashe Higgs 0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58 c56003f6ff Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950)
* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb
2017-12-05 19:46:20 -06:00
oranges 4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 03:23:06 -06:00
ShizCalev 4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
vuonojenmustaturska 744a78e932 Maybe fixes meson hearing exploit (#33005)
* Not all of wisdom brings joy

* Serves me right for making changes based on how i remember the code working
2017-11-25 13:25:24 -06:00
Emmett Gaines 0b07f80b62 custom docker improvements (#32626) 2017-11-24 12:59:17 -06:00
GupGup 8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale 2017-11-22 15:24:21 -06:00
Jordan Brown 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
vuonojenmustaturska 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
vuonojenmustaturska 23f2815bb7 Speeds up saycode by almost doubling get_hearers_in_view() performance (#32650)
* The sun is also a warrior

* Knowledge can also destroy

* nor can the kindest will preserve you from the kill
2017-11-16 05:09:20 -06:00
LetterJay 16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
LetterJay bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
LetterJay c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371
[MIRROR] SSoverlay improvements and tweaks
2017-11-14 14:56:34 -06:00
arsserpentarium d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay 32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558
[MIRROR] Prevent placing posters on diagonal wall corners
2017-11-13 11:50:36 -06:00
Emmett Gaines 3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
oranges 43113cd9b5 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
Tad Hardesty 96b30fa61e Prevent placing posters on diagonally-smoothed walls (#32558)
Posters are also knocked off the walls if they change to being
diagonally smoothed later.
2017-11-13 02:33:30 -06:00
LetterJay 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay 3bd0fda1ba Update unsorted.dm 2017-11-11 15:53:07 -06:00
Kyle Spier-Swenson 2d8fc6de61 SSoverlay improvements and tweaks (#32371)
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
2017-11-10 13:26:23 -06:00
Incoming5643 fea3709963 Doubles the length of Twitterize's accepted string length (#32552)
twitter made a bad decision and I intend to capitalize on it
2017-11-09 19:48:00 -06:00
LetterJay 2230c79af3 Update unsorted.dm 2017-11-09 03:17:35 -06:00
kevinz000 b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00