Jordan Brown
28c4705750
Merge pull request #33312 from ninjanomnom/oldturf
...
old turf in afterShuttleMove
2017-12-06 22:51:09 -06:00
deathride58
e7e9a4cc9b
Merge pull request #4245 from Citadel-Station-13/upstream-merge-33182
...
[MIRROR] Fugu improvements
2017-12-06 17:52:03 +00:00
deathride58
c2d1c38367
Merge pull request #4244 from Citadel-Station-13/upstream-merge-33222
...
[MIRROR] Makes silicon chat more visible
2017-12-06 17:51:17 +00:00
deathride58
d923d355f2
Merge pull request #4242 from Citadel-Station-13/upstream-merge-32950
...
[MIRROR] Adds support for non-1:1 screen ratios (Doesn't add widescreen)
2017-12-06 17:50:28 +00:00
Armhulen
45b9b4956c
Fugu improvements ( #33182 )
...
* come on, you know i wumbo you wumbo he she me wumbo
* it's hip to wumbo
2017-12-06 06:32:50 -06:00
Dax Dupont
4b6660814a
Makes sillicon chat more visible ( #33222 )
...
Made it green on black
Forgot to remove it at the bold thingy
2017-12-06 06:20:27 -06:00
deathride58
c1cd970cc4
Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274
...
[MIRROR] Removes ComponentActivated in favor of callbacks
2017-12-06 03:53:35 +00:00
deathride58
989102f552
Update protolathe.dm
2017-12-05 21:04:00 -05:00
deathride58
0f853fd744
Update circuitprinter.dm
2017-12-05 21:03:21 -05: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
deathride58
71d0804bce
Update circuitprinter.dm
2017-12-05 18:26:41 -05:00
deathride58
838011614e
Update rdmachines.dm
2017-12-05 17:47:38 -05:00
deathride58
db8ef8969d
Update protolathe.dm
2017-12-05 17:47:12 -05:00
deathride58
15fd10790c
Update circuitprinter.dm
2017-12-05 17:46:31 -05:00
deathride58
9c0eae753d
Update circuitprinter.dm
2017-12-05 17:44:45 -05:00
deathride58
d2a52f5c72
Merge pull request #4229 from Citadel-Station-13/upstream-merge-33268
...
[MIRROR] Fixes ahelp trimming
2017-12-05 22:39:25 +00:00
Jordan Brown
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
deathride58
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
AnturK
4671fd9724
Fixes ahelp trimming ( #33268 )
2017-12-05 14:27:16 -06:00
deathride58
d472cc4ba9
Merge pull request #4216 from Citadel-Station-13/upstream-merge-33234
...
[MIRROR] Stethoscopes now inform the user if the target can be defibrillated
2017-12-05 20:18:43 +00:00
deathride58
3526d4045a
Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288
...
[MIRROR] Fixes powernets
2017-12-05 20:17:33 +00:00
deathride58
565852d835
Merge pull request #4218 from Citadel-Station-13/upstream-merge-32964
...
[MIRROR] Measure energy values in joules
2017-12-05 20:12:25 +00:00
oranges
4b2a1c9d77
Merge pull request #33277 from tgstation/Cyberboss-patch-8
...
Fixes departmental say
2017-12-05 04:08:13 -06:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -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
Ashe Higgs
7b3c2862d3
Stethoscope defibrillation checking ( #33234 )
2017-12-05 03:22:48 -06:00
AnturK
005c6dcb59
Fixes powernets ( #33288 )
2017-12-05 03:22:33 -06:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58
858a9bf428
Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624
...
[MIRROR] [READY]Refactors uplinks to a component!
2017-12-04 23:12:45 +00:00
deathride58
a02983691d
Merge pull request #4198 from Citadel-Station-13/upstream-merge-33213
...
[MIRROR] Adds emergency lights, built into light fixtures
2017-12-04 22:14:15 +00:00
deathride58
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
deathride58
47960ab931
fixes conflict with base cit code, modularizes citadel uplink items file
2017-12-04 17:07:28 -05:00
deathride58
b9731895fd
Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858
...
[MIRROR] Divides species in subtypes, makes viruses able to infect certain subtypes
2017-12-04 21:57:29 +00:00
deathride58
8a75e55b42
Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213
2017-12-04 16:54:32 -05:00
deathride58
64aadb868e
Merge branch 'master' into upstream-merge-33213
2017-12-04 21:39:30 +00:00
deathride58
1a40fe16bd
adds species_organic to cit races
2017-12-04 16:38:39 -05:00
deathride58
4ddbe28068
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
...
[MIRROR] Holorecord disks.
2017-12-04 21:29:44 +00:00
deathride58
7e1bd55f7c
Update speedbike.dm
2017-12-04 16:23:58 -05:00
deathride58
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
deathride58
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
deathride58
84fe88153e
merges #4208
2017-12-04 16:17:43 -05:00
deathride58
7150e738e7
Update autolathe_designs.dm
2017-12-04 16:08:49 -05:00
deathride58
692bd0b550
Merge pull request #4206 from Citadel-Station-13/upstream-merge-33215
...
[MIRROR] Integrated circuit fixes
2017-12-04 21:06:51 +00:00
AnturK
1cc3e33714
Holorecord disks.
2017-12-04 05:14:13 -06:00
ACCount
00279c71f0
IC fixes ( #33215 )
2017-12-04 04:53:12 -06:00
QualityVan
4f8323a735
Fixes missing eyes being absent ( #33203 )
2017-12-04 04:50:55 -06:00
deathride58
65d5c779c3
Merge pull request #4203 from Citadel-Station-13/upstream-merge-33217
...
[MIRROR] Makes ahelp timestamps consistent with logs
2017-12-03 23:33:17 +00:00
deathride58
222346bf30
Update say.dm
2017-12-03 18:29:08 -05:00
deathride58
4d29723302
Update lighting.dm
2017-12-03 18:25:54 -05:00
deathride58
1e6716f91b
Merge pull request #4196 from Citadel-Station-13/upstream-merge-33214
...
[MIRROR] spellcheck weapon firing mechanism description
2017-12-03 23:23:30 +00:00
