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
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
2e61af534e
Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420
...
[MIRROR] Bullet decals tweak
2017-10-14 10:17:18 -04:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
506324fbec
Merge pull request #31670 from tgstation/Cyberboss-patch-3
...
IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 09:07:03 -05:00
635e430ec6
Merge pull request #31668 from tgstation/Cyberboss-patch-2
...
Fixes slapping while restrained/etc...
2017-10-14 09:05:49 -05:00
5ea5dc40df
hos ded
2017-10-14 03:42:08 -04:00
f6f114af12
Removes unused list ( #31662 )
2017-10-14 00:50:35 -05:00
dd8fb2a5ad
Merge pull request #31655 from duncathan/atmos-patch1
...
Slight change to the behavior of Assimilate_Air()
2017-10-13 23:50:05 -05:00
5fdaba2b0e
Merge pull request #31693 from Armhulen/patch-12
...
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-13 23:49:54 -05:00
cf155736cf
New Chaplain Weapon: Hammer of Pride! ( #31454 )
...
* cool beans
* i think this works
* i'm only human after all
don't put the blame on me
* is this what you wanted??
* ya
* K
2017-10-13 23:44:39 -05:00
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
c28932e4d4
Update displaycase.dm
2017-10-13 22:57:31 -05:00
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
e18e99f56f
Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
...
[MIRROR] Fixes electrocution animation
2017-10-13 23:37:46 -04:00
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
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
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
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
80eefdd6a0
Update collector.dm
2017-10-13 22:32:45 -05:00
732dc95c14
Update kitchen_spike.dm
2017-10-13 22:32:32 -05:00
c5abf8b01f
Update hivebot.dm
2017-10-13 22:32:10 -05:00
3df2049f44
Update teleportation.dm
2017-10-13 22:31:10 -05:00
de20eb645c
Update robot_items.dm
2017-10-13 22:30:41 -05:00
77d6420db0
Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-13 19:09:45 -05:00
ac660b6e3e
Invisible wirecutters and made screwdrivers hivis ( #31649 )
2017-10-13 18:35:58 -05:00
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
4100473aba
Smoke Machine Updates & Fixes ( #31598 )
...
* Smoke Machine Update
* Update smoke_machine.dm
* Compiling again
2017-10-13 16:50:32 -05:00
af1aea7e71
Small lighting perf tweak ( #31635 )
...
* lightshit
* Revert "lightshit"
This reverts commit 25a1b6e4a104546c6393d3c472c0412f7580fe96.
* bfghsfg
* kreegah
* honk
2017-10-13 16:30:47 -05:00
c7afe4f70e
Cleans up explosives at syndie base ruin ( #31645 )
2017-10-13 16:29:36 -05:00
fdffebb3b8
You can now drag-drop people into open DNA scanners ( #31646 )
2017-10-13 16:28:24 -05:00
282bc3e5f1
Medibots will no longer inject people in lockers/sleepers/etc ( #31648 )
2017-10-13 16:26:12 -05:00
14dc8a5a35
Update life.dm
2017-10-13 12:30:35 -05:00
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
75bdbccbe7
Various grammar fixes
2017-10-13 11:57:00 -05:00
7f26d59541
Fixes Shambrero Penguin names
2017-10-13 11:55:48 -05:00
ce743f7d42
Update world.dm
2017-10-13 10:30:18 -05:00
2d66ab4171
Update life.dm
2017-10-13 10:26:25 -05:00
6e10c020ec
Update syndieminibomb.dm
2017-10-13 10:26:07 -05:00
b9c07e7f66
Merge pull request #3363 from Citadel-Station-13/upstream-merge-31607
...
[MIRROR] Fixes preferences generation
2017-10-13 11:24:46 -04:00
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
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
c84a270403
Fixes preferences generation ( #31607 )
2017-10-13 09:16:03 -05:00
40a1ceed26
Fixes explosion particles causing a massive amount of runtimes ( #31608 )
2017-10-13 09:15:53 -05:00
1941a8fcfa
Merge pull request #31614 from AnturK/zap
...
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
9d448fda76
Merge pull request #31602 from AnturK/tunnels
...
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
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
da1eb3cd52
Merge branch 'master' into upstream-merge-31631
2017-10-13 08:31:13 -04:00
cd562a3c87
Update centcomAway.dm
2017-10-13 07:30:23 -05:00
LetterJay