oranges
ab73b4569a
Merge pull request #18413 from phil235/FixAssortment1
...
Fives Fixes
2016-06-11 10:05:35 +12:00
oranges
db05d6939e
Merge pull request #18399 from bgobandit/stopfuckingbumpingmeyoufuckshit
...
Interrupted drawings will not affect the text buffer.
2016-06-10 15:58:53 +12:00
Joan Lung
4b9c4c7adb
Merge pull request #18394 from lzimann/stools2
...
Bar stool no longer becomes a normal stool and are now constructables
2016-06-09 22:01:19 -04:00
oranges
fc23d8464c
Merge pull request #18386 from hornygranny/patch-8
...
fixes godhand not deleting on drop
2016-06-10 11:51:17 +12:00
Razharas
4b7d83be77
Merge pull request #18375 from ChangelingRain/gearhud
...
Makes cyborg ratvar conversion work properly
2016-06-09 22:43:54 +03:00
phil235
219639e00b
Using a multitool on telepad with open panel to save data no longer hits the machine.
...
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
2016-06-09 20:46:00 +02:00
Joan Lung
8d2da45e8c
duh
2016-06-09 08:39:16 -04:00
Joan Lung
c5ee14a0e3
gotta emag the borg
2016-06-09 08:21:24 -04:00
nullbear
98ee507de8
Adds noteleport variable
...
This is mostly a pre-setup for my greater-bag-of-holding stuff.
You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.
Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.
A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.
Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
oranges
c143e30ab5
Merge pull request #18350 from GunHog/AshTreaders
...
Mining Cyborg Ash Storm Plating Upgrade
2016-06-09 15:46:06 +12:00
oranges
a08cff21f0
Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
...
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
oranges
4af9392f01
Merge pull request #18333 from KorPhaeron/charter
...
Captain's Charter/Captain can name the station
2016-06-09 15:39:41 +12:00
bgobandit
011bca9a3e
Interrupted drawings will not affect the text buffer.
2016-06-08 23:34:27 -04:00
Joan Lung
16fa622e56
this is all butts
2016-06-08 23:18:23 -04:00
Lzimann
7602b99111
Bar stools are now constructable
2016-06-09 00:18:11 -03:00
KorPhaeron
576c215270
Fixes charter
2016-06-08 21:04:01 -05:00
Lzimann
9a9fd0a06a
I fucked up
2016-06-08 22:36:04 -03:00
hornygranny
6f9168aee1
fixes godhand not deleting on drop
...
fixes dismembering chaplains to steal the godhand
2016-06-08 16:21:50 -07:00
oranges
d5389459fb
Merge pull request #18359 from lzimann/doublesharp
...
Fix dual e-swords not being able to dismember
2016-06-09 09:16:19 +12:00
Joan Lung
0765173ee2
hudupdate
2016-06-08 15:59:12 -04:00
Joan Lung
4f8133c3d1
unfucks ratvar conversion
2016-06-08 15:50:06 -04:00
Lzimann
bd8f24f509
Moves sharpness and w_class after DNA check
2016-06-08 10:43:42 -03:00
AnturK
05b9307a09
Merge pull request #18335 from Fox-McCloud/experimental
...
Experimentor Fixes
2016-06-08 13:14:57 +02:00
AnturK
a14fe0c18b
Merge pull request #18323 from KorPhaeron/clown_buff
...
Clown makes a sad trombone noise on death
2016-06-08 10:47:56 +02:00
LatD
f3545d8d3b
Balances pyro anomaly ( #18310 )
...
* End damage buff
* Nerfs constant damage
2016-06-08 19:23:10 +12:00
oranges
c5a84c769d
Merge pull request #18036 from AnturK/init_meme
...
Defers some list initializations
2016-06-08 19:20:04 +12:00
Leo
cf27511dc9
Bar stool FIGHTS ( #18325 )
2016-06-08 13:29:47 +12:00
Lzimann
8f014d93ca
Now they actually dismember
2016-06-07 21:35:12 -03:00
GunHog
61b235d23c
Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders
...
# Conflicts:
# code/modules/research/designs/mechfabricator_designs.dm
2016-06-07 18:37:38 -05:00
Lzimann
a16ce87454
Dual e-swords dismemberment
2016-06-07 18:15:56 -03:00
oranges
0408ffa9ba
Merge pull request #18299 from PKPenguin321/patch-6
...
fixes hulks attacking with dual eswords
2016-06-08 09:11:18 +12:00
Joan Lung
61c2d6aee0
Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too
...
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
2016-06-07 17:09:39 -04:00
TechnoAlchemist
7c0760764d
fuck
2016-06-07 13:44:06 -07:00
TechnoAlchemist
10c547d364
Coiax
2016-06-07 13:43:11 -07:00
AnturK
19eb97ae18
Moves some list initializations to New
...
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
GunHog
ff90dda131
Mining Cyborg Ash Storm Plating Upgrade
...
Adds an upgrade to Mining Borgies which will make them immune to ash
storms while looking TOTALLY AWESOME.
2016-06-07 11:25:19 -05:00
TechnoAlchemist
154982500b
God is good.
2016-06-07 04:54:06 -07:00
LatD
25827d6ccb
[Ready] Tweaks some R&D levels ( #18246 )
...
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
2016-06-07 20:18:19 +12:00
KorPhaeron
51d7f86e6a
Admin Override
2016-06-07 01:57:33 -05:00
Fox-McCloud
4ce47d1a6f
Experimentor Fixes
2016-06-07 02:10:44 -04:00
KorPhaeron
69a6ce2e5d
Captain's Charter
2016-06-07 00:14:39 -05:00
Jack Edge
8cbb10cab2
Moved dragon loot into necropolis_chests.dm
...
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275 , lava staff can no longer turn transit tiles to lava.
2016-06-07 02:57:12 +01:00
oranges
78b73b5163
Merge pull request #18292 from ChangelingRain/mercyofRATVAR
...
Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix
2016-06-07 13:08:01 +12:00
oranges
2aba5f48ef
Merge pull request #18263 from pudl/big-daddy-thicc-dick
...
Adds bar stools
2016-06-07 12:59:34 +12:00
oranges
05b4e82e02
Merge pull request #18272 from xxalpha/nukemyshitup
...
Syndicate toolbox now has syndicate screwdriver.
2016-06-07 12:57:44 +12:00
KorPhaeron
3526562fa2
The joke was on me all along
2016-06-06 19:08:48 -05:00
PKPenguin321
5d76e239ef
moves the parent call
2016-06-06 17:02:08 -07:00
Joan Lung
22aff568c6
but with conflictless sprites
2016-06-06 19:59:37 -04:00
KorPhaeron
cd4855688d
Sad Trombone Implant
2016-06-06 18:49:14 -05:00
oranges
744b722a12
Merge pull request #18241 from phil235/BloodRefactor
...
Blood refactor stuff
2016-06-07 10:09:35 +12:00
