Commit Graph

6749 Commits

Author SHA1 Message Date
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
486982b422 Merge pull request #32145 from PKPenguin321/patch-16
Fixes a camera issue with scout holoparasites
2017-10-31 15:32:04 -05:00
oranges
c5e11eceed Some minor contamination fixes 2017-10-31 15:30:53 -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
oranges
aa88e61169 Merge pull request #32109 from ACCount12/runtime_a_day
Fixes a common runtime on prefs screen
2017-10-31 15:21:20 -05:00
FrozenGuy5
adca482008 Nerfs smoke machine + improves grammar (#32196)
* https is the way to go

* changes links to https:// instead of http://

* tsk tsk byond

* Nerfs smoke machine + improves grammar

* requested changes

* i can spell
2017-10-31 15:19:08 -05:00
Jordan Brown
55653fa1ee Replace most islist calls in components with length() (#32158)
islist was used to check if a thing was

A. A list of things
B. 1 thing

length was profiled to be faster
2017-10-31 15:12:42 -05:00
Jordan Brown
0e037767cd Minor optimization for _GetInverseTypeList (#32155)
* Minor optimization for _GetInverseTypeList

* We also need to make sure the root component is never instantiated to avoid stack overflows
2017-10-31 15:11:25 -05:00
Emmett Gaines
5118e6efe9 Makes isbanned have an arg for only checking real bans (#32248)
* makes isbanned have an arg for only checking real bans

* makes it return false if invalid data is passed in on a real bans check
2017-10-31 15:10:15 -05:00
Mercenaryblue
16c2f8f4c7 Honkbots Tablecrafting
You can now tablecraft Honkbots.
2017-10-31 12:26:59 -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
kevinz000
8a7f8c9bc6 Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring (#31769)
* Add GetAllContentsIgnoring which accepts an ignore typecache to ignore

* Update turf.dm

* fixes

* Update unsorted.dm

* Update turf.dm
2017-10-31 09:09:02 -05:00
LetterJay
5dd64d3423 Merge branch 'master' into upstream-merge-32221 2017-10-31 07:58:54 -04:00
LetterJay
31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849
[MIRROR] Comms console tweak
2017-10-31 07:58:15 -04:00
Michiyamenotehifunana
e0a153c4c7 9mm frangibles now requires hacked lathes, costs slightly less
They are by all means, lethal, even if they absolutely pale in comparison to regular bullets. They'll cost ever so slightly less materials to build.
2017-10-31 19:47:20 +08:00
LetterJay
b0421ae160 Update communications.dm 2017-10-31 06:36:01 -05:00
Michiyamenotehifunana
f25c1b5cce CRITICAL FIX FOR EXPLODING TOYS
OH GOD THIS IS SUCH A HILLARIOUS OVERSIGHT
2017-10-31 19:00:04 +08:00
Michiyamenotehifunana
beb27926b2 Fixes Cit's Toys a little
Mk.37F no longer needs a permit, Non euplastic blade no longer can turn into dual toyswords
2017-10-31 18:00:45 +08:00
Michiyamenotehifunana
068976c971 Rebalances citprojectiles somewhat
Magjectiles have had their speed and range nerfed by about 50%, non lethal 9mms have lower speed and drastically lower range.
2017-10-31 16:37:09 +08: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
CitadelStationBot
125f81de08 [MIRROR] Use associative list instead of in (#3710)
* Merge pull request #32128 from Cyberboss/LocateFix

Use associative list instead of `in`

* Use associative list instead of `in`
2017-10-31 00:43:39 -07:00
LetterJay
85c0300858 Update communications.dm 2017-10-31 02:29:49 -05:00
LetterJay
528c7e7837 Merge branch 'master' into upstream-merge-32277 2017-10-31 03:09:38 -04:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118
[MIRROR] actually fixes not being able to stop wagging your tail this time
2017-10-31 03:03:58 -04:00
LetterJay
60e1b62be8 Merge pull request #3708 from Citadel-Station-13/upstream-merge-32213
[MIRROR] New ambience for ash storms
2017-10-31 03:03:37 -04: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
1d992f2dfd Merge pull request #3705 from Citadel-Station-13/upstream-merge-32222
[MIRROR] Ignore verb now also shows ghost names
2017-10-31 03:02:05 -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
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123
[MIRROR] Removes statues from the gold slime pool
2017-10-31 03:01:34 -04:00
LetterJay
a0f3edf6ca Merge pull request #3701 from Citadel-Station-13/upstream-merge-32150
[MIRROR] Meteor gating tweaks
2017-10-31 03:00:49 -04:00
LetterJay
cec63d54f4 Merge pull request #3700 from Citadel-Station-13/upstream-merge-32191
[MIRROR] Fixes latejoin/mulligan traitors.
2017-10-31 03:00:36 -04:00
LetterJay
157817f5dc Merge pull request #3699 from Citadel-Station-13/upstream-merge-32210
[MIRROR] fixes clockcults appearing as grey box on sechuds until they reequip their id
2017-10-31 03:00:19 -04:00
LetterJay
66bacbfedc Merge pull request #3698 from Citadel-Station-13/upstream-merge-32209
[MIRROR] Fixes mech recharger integrity bar
2017-10-31 03:00:08 -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
LetterJay
6ba4300f6e Merge pull request #3696 from Citadel-Station-13/upstream-merge-32212
[MIRROR] fixes radios being perma-stuck on when emped
2017-10-31 02:59:32 -04:00
LetterJay
98874b1f05 Merge pull request #3695 from Citadel-Station-13/upstream-merge-32215
[MIRROR] fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-31 02:59:14 -04:00
LetterJay
32fb136bf0 Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855
[MIRROR] Dullahans
2017-10-30 23:54:25 -04:00
LetterJay
8c1dcd9429 Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986
[MIRROR] You can now hide grenades in plushies
2017-10-30 23:33:16 -04:00
LetterJay
09a198fb65 Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225
[MIRROR] Deterministic output slots for smartfridges
2017-10-30 23:32:39 -04:00
LetterJay
53314289c8 Merge branch 'master' into upstream-merge-31855 2017-10-30 23:31:13 -04:00
LetterJay
f80bb03a23 Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238
[MIRROR] welder refuelling hotfix
2017-10-30 23:30:22 -04:00
LetterJay
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
LetterJay
21d4ed4a5f Merge pull request #3685 from Citadel-Station-13/upstream-merge-32200
[MIRROR] Adds force to items that lack force and shouldn't.
2017-10-30 22:14:15 -04:00
LetterJay
d3b5b64a51 Merge branch 'master' into upstream-merge-32238 2017-10-30 22:13:51 -04:00
LetterJay
4dbcce6885 Merge pull request #3683 from Citadel-Station-13/upstream-merge-32143
[MIRROR] Allows filling welders from open containers that have welding fuel in them
2017-10-30 22:12:04 -04:00
LetterJay
df6bd6fa4c Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140
[MIRROR] Fixes filling smoke machines with pills
2017-10-30 22:11:44 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
b5670646f7 Update communications.dm 2017-10-30 21:08:24 -05:00