Commit Graph

1131 Commits

Author SHA1 Message Date
vuonojenmustaturska
355de66eeb Allows non-humans to be chem scanned via the health analyzer (#32457) 2017-11-07 08:02:22 -06:00
LetterJay
c393addda3 Merge pull request #3839 from Citadel-Station-13/upstream-merge-32046
[MIRROR] Plush Ratvar can now fight plush Nar-Sie
2017-11-07 04:46:32 -06:00
LetterJay
f254e6fb9d Merge pull request #3838 from Citadel-Station-13/upstream-merge-32408
[MIRROR] Fixes hand tele losing ranged portal-dispel function
2017-11-07 04:45:52 -06:00
LetterJay
0ca35e765d Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
2017-11-07 04:44:08 -06:00
LetterJay
890ed4b2ba Merge pull request #3820 from Citadel-Station-13/upstream-merge-32276
[MIRROR] PKborgs can no longer activate projectile fields if someone is buckled
2017-11-07 04:41:04 -06:00
oranges
1068b8f22d Merge pull request #32456 from vuonojenmustaturska/ghostmemes
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
Ashe Higgs
31dfd7e8fb Plush Ratvar can now fight plush Nar-Sie (#32046)
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
2017-11-06 14:44:25 -06:00
kevinz000
42deca4f72 Fixes hand tele losing ranged portal-dispel function (#32408)
* Fixes hand teles not dispelling at range
2017-11-06 14:43:14 -06:00
kevinz000
044384d0b1 1# This is a combination of 2 commits. (#32276)
can no longer turn on projectile dampener with buckled mobs
2017-11-05 04:28:51 -06:00
ACCount
ceece097bf Fixes flamethrower icon not updating on plasma tank removal (#32401) 2017-11-05 02:08:36 -06:00
LetterJay
065dcb6eab Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381
[MIRROR] Restores buckling sanity.
2017-11-04 22:53:54 -05:00
LetterJay
290daedf9a Merge pull request #3801 from Citadel-Station-13/upstream-merge-32378
[MIRROR] Fixes using RPDs on catwalks and allows using on lattices
2017-11-04 22:51:33 -05:00
LetterJay
7d0ac85ec6 Merge pull request #3798 from Citadel-Station-13/upstream-merge-32316
[MIRROR] Wall damage decal overhaul
2017-11-04 22:50:29 -05:00
LetterJay
3f1d478c27 Merge pull request #3795 from Michiyamenotehifunana/secskirt
Security Skirts and more!
2017-11-04 22:49:14 -05:00
LetterJay
6c1347366a Merge pull request #3792 from Citadel-Station-13/upstream-merge-32342
[MIRROR] Fixes golem shells breaking spawners menu
2017-11-04 22:47:59 -05:00
Leo
0af8cf0329 Merge pull request #32381 from AnturK/ridingdatumsneveragain
Restores buckling sanity.
2017-11-04 13:08:19 -05:00
YPOQ
b5cdfe5070 Fixes using RPDs on catwalks and allows using on lattices (#32378) 2017-11-04 10:10:00 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
AnturK
bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
ShizCalev
6e90fd9f6d fixes pie cannon bug (#32360) 2017-11-03 15:54:11 -05:00
LetterJay
73f54f340f Merge pull request #3770 from Citadel-Station-13/upstream-merge-32328
[MIRROR] Refactors the RCD code a tiny bit. One minor balance change
2017-11-03 00:14:58 -05:00
LetterJay
f2ff0e1ad3 Merge pull request #3769 from Citadel-Station-13/upstream-merge-32313
[MIRROR] Hotel Security spellchecked
2017-11-03 00:14:43 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640
[MIRROR] [Ready]Ghosts can now Health Scan
2017-11-03 00:13:58 -05:00
LetterJay
8d1a80d047 Merge pull request #3763 from Citadel-Station-13/upstream-merge-32270
[MIRROR] You can now use banhammers as a weapon
2017-11-03 00:13:17 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284
[MIRROR] Fix a few syntactic aberrations
2017-11-03 00:13:00 -05:00
LetterJay
57655dfd60 Merge pull request #3760 from Citadel-Station-13/upstream-merge-32290
[MIRROR] fixes being able to recharge an object with an inducer while inside the object
2017-11-03 00:12:22 -05:00
LetterJay
5b890dc8a6 Merge pull request #3749 from Citadel-Station-13/upstream-merge-32288
[MIRROR] Fixes hand tele adjacent attacks teleporting you
2017-11-02 23:50:38 -05:00
Jalleo
76bce07100 Refactors the RCD code a tiny bit. One minor balance change (#32328)
* Refactors the RCD code a tad to remove a variable from all RCD's and instead get the reinf_walls.dm checks to be a compiled check with a istype.

* Reverts back to variables for the reinforced walls check. Still reduced the amount of nessecary lines for it though
2017-11-02 13:55:46 -05:00
Mercenaryblue
67a91aaf41 Hotel Security spellchecked (#32313)
* spellcheck

interests

* spellcheck
2017-11-02 13:29:15 -05:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640)
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
2017-11-02 08:46:42 -05:00
MoreRobustThanYou
4c857e446a You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 04:26:06 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
LetterJay
18e4c1c6a0 Merge pull request #3754 from Citadel-Station-13/upstream-merge-32282
[MIRROR] Fix ghosts causing portals to spark
2017-11-02 04:20:43 -05:00
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
CitadelStationBot
b93d28d9aa Merge pull request #3736 from Citadel-Station-13/upstream-merge-32252
[MIRROR] Reflector fixes and improvements
2017-11-02 04:07:01 -05:00
CitadelStationBot
9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942
[MIRROR] Shuttle rotation refactor and significant performance upgrade
2017-11-02 04:06:31 -05:00
Tad Hardesty
4e0a5bf3de Fix ghosts causing portals to spark 2017-11-02 01:24:50 -05:00
Leo
cf6ee8d4c2 Merge pull request #32288 from kevinz000/patch-369
Fixes hand tele adjacent attacks teleporting you
2017-11-01 21:38:21 -05:00
LetterJay
84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251
[MIRROR] Nerfs peaceborg chain bucklestun
2017-11-01 01:44:55 -04:00
LetterJay
5d46fbb8d3 Merge pull request #3730 from Citadel-Station-13/upstream-merge-32250
[MIRROR] Makes greyscaled cables' color viewable in map editing
2017-11-01 01:44:05 -04:00
ACCount
cfaa6a9cd5 Reflector fixes and improvements 2017-10-31 21:01:45 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
AnturK
d792624dd8 Nerfs peaceborg chain bucklestun (#32251)
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
2017-10-31 17:40:03 -05:00
oranges
59f3a714e2 Merge pull request #32250 from ninjanomnom/map-cable-color
Makes greyscaled cables' color viewable in map editing
2017-10-31 15:30:45 -05:00
kevinz000
d836803b53 Makes varediting pneumatic cannon easier and makes the code less snowflake-y (#31752)
* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm
2017-10-31 09:14:16 -05:00
CitadelStationBot
e7179ba02d [MIRROR] Removes force from slappers (#3711)
* Merge pull request #32153 from tgstation/Cyberboss-patch-4

Removes force from slappers

* Removes force from slappers
2017-10-31 00:43:48 -07:00
LetterJay
761acb5084 Merge pull request #3706 from Citadel-Station-13/upstream-merge-32134
[MIRROR] Makes rollerbeds normal-sized items
2017-10-31 03:02:43 -04:00
LetterJay
cfae6fc672 Merge pull request #3704 from Citadel-Station-13/upstream-merge-32146
[MIRROR] Fixes rollies not being effective
2017-10-31 03:01:56 -04:00
LetterJay
8923b75a74 Merge pull request #3697 from Citadel-Station-13/upstream-merge-32211
[MIRROR] Fixes cyborg upgrades not applying to held items
2017-10-31 02:59:58 -04:00