805442ee51
Merge pull request #34194 from ninjanomnom/tag-stack
...
Makes the tag warning a stack_trace
2018-01-10 03:12:54 -06:00
af96f58ffd
syncs defines
2018-01-03 23:15:49 -05:00
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
ea3652c30e
fuk
2018-01-01 11:07:40 -06:00
6c147c9ef3
Merge branch 'master' into upstream-merge-33660
2018-01-01 04:59:20 -06:00
ab11e4be2e
Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937
...
[MIRROR] printplayer fix for jobless minds
2017-12-31 02:50:34 -06:00
4237a8910c
Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
...
[MIRROR] Makes newscaster feedback messages and comments always a list.
2017-12-30 14:13:03 -06:00
3128c26698
Merge pull request #33937 from AnturK/printplayerfix
...
printplayer fix for jobless minds
2017-12-30 14:04:05 -06:00
dda430131a
Update roundend.dm
2017-12-30 13:28:58 -06:00
54b6eddebc
Merge branch 'master' into upstream-merge-33660
2017-12-29 18:40:29 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
72ab9444c1
Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876
...
[MIRROR] Cleans up survivor counting tiny bit
2017-12-29 06:25:11 -06:00
ad59b058ad
Merge pull request #33876 from AnturK/roundend_feedback_standard
...
Cleans up survivor counting tiny bit
2017-12-29 00:29:49 -06:00
ccdccb57af
Adds roundend nuke disk location tracking to feedback.
2017-12-29 00:29:12 -06:00
ab408d3e97
Made atoms not smooth with shuttles ( #33807 )
...
* Made atoms not smooth with shuttles
* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null
* Moved pirate shuttle areas into the multi-area shuttles section
2017-12-29 00:29:04 -06:00
4cfb2e323b
Merge branch 'master' into upstream-merge-33504
2017-12-26 06:08:12 -06:00
e2ba458400
Update roundend.dm
2017-12-24 02:40:05 -06:00
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
a912e14912
Makes newscaster feedback messages and comments always a list.
2017-12-21 07:13:54 -06:00
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
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
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
00d3b8f1b7
a lot of shit synced in this one commit.
2017-12-20 02:53:51 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
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
8a1ed70888
Update roundend.dm
2017-12-20 00:08:37 -06:00
e6cab75e71
NukeDatum
2017-12-19 19:22:03 -06:00
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
420bebf36f
Update radio.dm
2017-12-17 15:56:29 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
70abf6d8e9
Saves newscaster data and photos to round logs folder
2017-12-14 03:44:14 -06:00
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
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
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
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
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
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
ae48e14876
Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell
...
Step backwards version of hex2num
2017-12-09 15:54:14 -06:00
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
f7d5ab5baf
Fixes some broken random events ( #33345 )
2017-12-08 10:34:50 -06:00
ec0f2291c9
Merge pull request #33272 from tgstation/Cyberboss-patch-7
...
Speeds up some list helpers
2017-12-08 10:34:20 -06:00
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
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
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
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
0b07f80b62
custom docker improvements ( #32626 )
2017-11-24 12:59:17 -06:00
Leo