31b2ce9cf7
IV stand span classes
2015-05-26 23:07:21 -04:00
e510f6625f
Fixes IV stands blocking bullets
...
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.
Flipped tables now block small mobs.
2015-05-26 23:05:38 -04:00
5a1bf5a6a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/toys.dm
2015-05-26 08:26:48 +02:00
fff9e5ec92
Merge pull request #9463 from PsiOmegaDelta/SinfulLiving
...
Fixes #9461 .
2015-05-26 02:11:31 -04:00
711ad88903
Fixes #9294
...
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.
Figured a quickfix would be better than a very delayed fix.
2015-05-25 22:26:55 +02:00
4956af8597
Fixes #9461 .
...
Corrects the path of the uplink item.
2015-05-25 17:59:41 +02:00
c08774d96e
Updates bear traps
...
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.
Conflicts:
baystation12.dme
2015-05-24 16:33:41 -04:00
b01c3a4ba9
Merge pull request #9451 from PsiOmegaDelta/Tmp
...
Fixes #9447 .
2015-05-24 18:16:08 +03:00
7835afc361
Merge pull request #9450 from mwerezak/workboots
...
Adds engineering workboots
2015-05-24 18:16:00 +03:00
3d9aa48f49
Merge pull request #9442 from GinjaNinja32/shuttle
...
Supply shuttle and crate fixes
2015-05-24 14:43:15 +02:00
2fc50e7d03
Merge pull request #9449 from mwerezak/airlock-sound
...
Airlock sounds
2015-05-24 14:43:09 +02:00
c21a456379
Fixes #9447 .
...
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
b4c88c6186
Adds engineering workboots
...
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04:00
e6be73ac56
Airlock sounds
2015-05-23 22:59:18 -04:00
5ee1e3df56
Fixes #9443 .
...
Restores an old sunflower sprite for use by toys.
2015-05-23 19:38:31 +02:00
3fb3a18f05
Supply shuttle and crate fixes
...
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
50dd6aa0bb
Merge with master.
2015-05-23 21:29:40 +09:30
a2571b95c3
Merge pull request #9418 from mwerezak/port-gen
...
Fixes portable generators going above their temperature limit
2015-05-23 20:40:07 +09:30
77099631d1
Updates del usages.
2015-05-22 08:27:12 +02:00
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
cf591c290b
Adds limit to prevent random walking below the lower limit temperature, too.
2015-05-22 02:21:12 -04:00
4d54742079
Fixes portable generators going about their temperature limit
2015-05-22 01:27:01 -04:00
a677ec3b83
Merge pull request #9412 from Kelenius/ofChemAndReadme
...
Updates Chemistry-Readme.dm
2015-05-22 06:37:25 +02:00
7d17f2eeb7
Items again have their loc set just before dropped() is called.
...
Fixes #9299 .
Fixes #9406 .
2015-05-21 17:55:31 +02:00
e9d9ff57ba
Remove redundant null argument in a view() call
2015-05-21 10:14:40 -04:00
bbc8ad6383
Add extra checks for Say :i
...
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
2015-05-21 09:18:02 -04:00
b9dbeeb356
Fix a problem with Say :i not working
2015-05-21 08:53:14 -04:00
360113850a
Updates Chemistry-Readme.dm
...
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03:00
ae3e80b85b
Merge pull request #9409 from GinjaNinja32/supply
...
Fixes supply shuttle
2015-05-21 12:30:20 +03:00
3377f8bbf1
Merge pull request #9407 from GinjaNinja32/floorpainter
...
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 18:43:00 +09:30
52ae206174
Merge pull request #9391 from comma/ghettoMD
...
Missed one baddie
2015-05-21 18:30:06 +09:30
900fb32aff
Fixes supply shuttle
2015-05-21 06:58:35 +01:00
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
293fb6782c
Merge pull request #9387 from Yoshax/syringespls
...
Fixes a typo/mistake
2015-05-21 12:51:27 +09:30
a1d84ff176
Merge pull request #9385 from GinjaNinja32/structure_climb
...
Fixes structure climbing
2015-05-21 03:58:13 +03:00
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
ecc2b3c437
Merge pull request #9258 from mwerezak/charge
...
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
53e3e2f6e6
Merge pull request #9379 from Zuhayr/materials
...
Materials + Morguemeat icon + bat nerf
2015-05-21 03:23:41 +03:00
97b2a63b76
Missed one baddie
...
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
9d14bc41de
Merge pull request #9389 from mwerezak/fire
...
Fire
2015-05-21 03:13:55 +03:00
7cfb921ca0
Fixes a typo/mistake
2015-05-20 20:36:24 +01:00
c345f317ac
Fixes structure climbing
2015-05-20 17:10:18 +01:00
9888a8a70b
Another PoolOrNew(new /type, loc) fix
2015-05-20 16:49:18 +01:00
aeb8f2a6c2
Fixes #9380
2015-05-20 16:44:47 +01:00
71da36ec01
Updated force vars on bats.
2015-05-21 00:52:17 +09:30
c3f0f42ec2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials
2015-05-21 00:49:14 +09:30
98def6e247
Updating dev from master.
2015-05-21 00:08:22 +09:30
01e8246e64
Clean up world print
2015-05-20 00:35:26 -04:00
a6f59edc22
Bit of documentation.
2015-05-20 14:00:14 +09:30
mwerezak