LetterJay
45619b0e1b
Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
...
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
LetterJay
87e8c66d5f
Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649
...
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
2017-10-14 10:21:27 -04:00
LetterJay
0397bd57c1
Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604
...
[MIRROR] Adds Toggle Underline button to PDA menu
2017-10-14 10:21:19 -04:00
LetterJay
dce56e3951
Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598
...
[MIRROR] Smoke Machine Updates & Fixes
2017-10-14 10:21:09 -04:00
LetterJay
27bd0ffebb
Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635
...
[MIRROR] Small lighting perf tweak
2017-10-14 10:20:36 -04:00
LetterJay
c442f49cde
Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645
...
[MIRROR] Cleans up explosives at syndie base
2017-10-14 10:20:27 -04:00
LetterJay
4b48651380
Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646
...
[MIRROR] You can now drag-drop people into open DNA scanners
2017-10-14 10:20:11 -04:00
LetterJay
fea2807378
Merge pull request #3371 from Citadel-Station-13/upstream-merge-31648
...
[MIRROR] Medibots will no longer inject people in lockers/sleepers/etc
2017-10-14 10:19:52 -04:00
LetterJay
5bbf3b9735
Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620
...
[MIRROR] Fixes various Nanotrasen capitalizations
2017-10-14 10:19:15 -04:00
LetterJay
9aa87f73c8
Merge pull request #3369 from Citadel-Station-13/upstream-merge-31628
...
[MIRROR] Various examine grammar fixes
2017-10-14 10:19:01 -04:00
LetterJay
f7123f0f4b
Merge pull request #3368 from Citadel-Station-13/upstream-merge-31623
...
[MIRROR] Fixes Shambrero Penguin Names
2017-10-14 10:18:43 -04:00
LetterJay
2e61af534e
Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420
...
[MIRROR] Bullet decals tweak
2017-10-14 10:17:18 -04:00
LetterJay
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
LetterJay
8aebc3b15a
Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
...
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
LetterJay
c28932e4d4
Update displaycase.dm
2017-10-13 22:57:31 -05:00
LetterJay
243e9d7acb
Merge pull request #3362 from Citadel-Station-13/upstream-merge-31608
...
[MIRROR] Fixes explosion particles causing a massive amount of runtimes
2017-10-13 23:37:55 -04:00
LetterJay
e18e99f56f
Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
...
[MIRROR] Fixes electrocution animation
2017-10-13 23:37:46 -04:00
LetterJay
64b04b2c2f
Merge pull request #3352 from Citadel-Station-13/upstream-merge-31631
...
[MIRROR] Use legacy topic keywords lookup method
2017-10-13 23:36:19 -04:00
LetterJay
aed26b120c
Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584
...
[MIRROR] Fixes ruins spawning over shuttle docks
2017-10-13 23:36:10 -04:00
LetterJay
66585f242c
Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512
...
[MIRROR] Refactors away mission & space ruin area code.
2017-10-13 23:36:01 -04:00
LetterJay
8360e8afd1
Merge pull request #3339 from Citadel-Station-13/upstream-merge-31557
...
[MIRROR] Cleans up some direct loc setting-s in single tank bombs
2017-10-13 23:35:52 -04:00
LetterJay
80eefdd6a0
Update collector.dm
2017-10-13 22:32:45 -05:00
LetterJay
732dc95c14
Update kitchen_spike.dm
2017-10-13 22:32:32 -05:00
LetterJay
c5abf8b01f
Update hivebot.dm
2017-10-13 22:32:10 -05:00
LetterJay
3df2049f44
Update teleportation.dm
2017-10-13 22:31:10 -05:00
LetterJay
de20eb645c
Update robot_items.dm
2017-10-13 22:30:41 -05:00
ShizCalev
ac660b6e3e
Invisible wirecutters and made screwdrivers hivis ( #31649 )
2017-10-13 18:35:58 -05:00
AlecW
482e61a57e
Adds Toggle Underline button to PDA menu ( #31604 )
...
* Add Toggle Underline button to PDA.dm
-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.
* Changed 1/0 to bools
Now using TRUE and FALSE, also cleaned some HTML I missed the first time
2017-10-13 16:51:44 -05:00
Robustin
4100473aba
Smoke Machine Updates & Fixes ( #31598 )
...
* Smoke Machine Update
* Update smoke_machine.dm
* Compiling again
2017-10-13 16:50:32 -05:00
vuonojenmustaturska
af1aea7e71
Small lighting perf tweak ( #31635 )
...
* lightshit
* Revert "lightshit"
This reverts commit 25a1b6e4a104546c6393d3c472c0412f7580fe96.
* bfghsfg
* kreegah
* honk
2017-10-13 16:30:47 -05:00
ShizCalev
c7afe4f70e
Cleans up explosives at syndie base ruin ( #31645 )
2017-10-13 16:29:36 -05:00
MoreRobustThanYou
fdffebb3b8
You can now drag-drop people into open DNA scanners ( #31646 )
2017-10-13 16:28:24 -05:00
MoreRobustThanYou
282bc3e5f1
Medibots will no longer inject people in lockers/sleepers/etc ( #31648 )
2017-10-13 16:26:12 -05:00
LetterJay
14dc8a5a35
Update life.dm
2017-10-13 12:30:35 -05:00
francinum
f63adc1931
Fixes various Nanotrasen capitalizations ( #31620 )
...
* Fixes capitalization of Nanotrasen for secsuits
gimme the GBP
* Fixes this one too
2017-10-13 12:13:26 -05:00
ShizCalev
75bdbccbe7
Various grammar fixes
2017-10-13 11:57:00 -05:00
militaires
7f26d59541
Fixes Shambrero Penguin names
2017-10-13 11:55:48 -05:00
LetterJay
ce743f7d42
Update world.dm
2017-10-13 10:30:18 -05:00
LetterJay
2d66ab4171
Update life.dm
2017-10-13 10:26:25 -05:00
LetterJay
6e10c020ec
Update syndieminibomb.dm
2017-10-13 10:26:07 -05:00
LetterJay
b9c07e7f66
Merge pull request #3363 from Citadel-Station-13/upstream-merge-31607
...
[MIRROR] Fixes preferences generation
2017-10-13 11:24:46 -04:00
nicbn
921b65ced0
Bullet decals tweak ( #31420 )
...
* wee
* screen clock update
* resist and stop pulling
* Whoop, Joan messed up on the selection border so here's some fixed icons for that
* there we go
* Update walls.dm
* Update walls.dm
* Update walls.dm
2017-10-13 09:47:10 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
kevinz000
c84a270403
Fixes preferences generation ( #31607 )
2017-10-13 09:16:03 -05:00
kevinz000
40a1ceed26
Fixes explosion particles causing a massive amount of runtimes ( #31608 )
2017-10-13 09:15:53 -05:00
Jordan Brown
1941a8fcfa
Merge pull request #31614 from AnturK/zap
...
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
Jordan Brown
9d448fda76
Merge pull request #31602 from AnturK/tunnels
...
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
LetterJay
692e226d24
Merge pull request #3346 from Citadel-Station-13/upstream-merge-31621
...
[MIRROR] Add require_comms_key = TRUE to some topic that need it
2017-10-13 08:58:00 -04:00
LetterJay
da1eb3cd52
Merge branch 'master' into upstream-merge-31631
2017-10-13 08:31:13 -04:00
