mwerezak
31b2ce9cf7
IV stand span classes
2015-05-26 23:07:21 -04:00
mwerezak
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
PsiOmega
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
Ccomp5950
fff9e5ec92
Merge pull request #9463 from PsiOmegaDelta/SinfulLiving
...
Fixes #9461 .
2015-05-26 02:11:31 -04:00
PsiOmega
4956af8597
Fixes #9461 .
...
Corrects the path of the uplink item.
2015-05-25 17:59:41 +02:00
mwerezak
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
Chinsky
b01c3a4ba9
Merge pull request #9451 from PsiOmegaDelta/Tmp
...
Fixes #9447 .
2015-05-24 18:16:08 +03:00
Chinsky
7835afc361
Merge pull request #9450 from mwerezak/workboots
...
Adds engineering workboots
2015-05-24 18:16:00 +03:00
PsiOmegaDelta
3d9aa48f49
Merge pull request #9442 from GinjaNinja32/shuttle
...
Supply shuttle and crate fixes
2015-05-24 14:43:15 +02:00
PsiOmega
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
mwerezak
b4c88c6186
Adds engineering workboots
...
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04:00
mwerezak
e6be73ac56
Airlock sounds
2015-05-23 22:59:18 -04:00
PsiOmega
5ee1e3df56
Fixes #9443 .
...
Restores an old sunflower sprite for use by toys.
2015-05-23 19:38:31 +02:00
GinjaNinja32
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
PsiOmega
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
Chinsky
ae3e80b85b
Merge pull request #9409 from GinjaNinja32/supply
...
Fixes supply shuttle
2015-05-21 12:30:20 +03:00
Zuhayr
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
GinjaNinja32
900fb32aff
Fixes supply shuttle
2015-05-21 06:58:35 +01:00
GinjaNinja32
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
Zuhayr
293fb6782c
Merge pull request #9387 from Yoshax/syringespls
...
Fixes a typo/mistake
2015-05-21 12:51:27 +09:30
Chinsky
a1d84ff176
Merge pull request #9385 from GinjaNinja32/structure_climb
...
Fixes structure climbing
2015-05-21 03:58:13 +03:00
Chinsky
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
Chinsky
ecc2b3c437
Merge pull request #9258 from mwerezak/charge
...
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Yoshax
7cfb921ca0
Fixes a typo/mistake
2015-05-20 20:36:24 +01:00
GinjaNinja32
c345f317ac
Fixes structure climbing
2015-05-20 17:10:18 +01:00
GinjaNinja32
aeb8f2a6c2
Fixes #9380
2015-05-20 16:44:47 +01:00
Zuhayr
71da36ec01
Updated force vars on bats.
2015-05-21 00:52:17 +09:30
Zuhayr
a6f59edc22
Bit of documentation.
2015-05-20 14:00:14 +09:30
mwerezak
c289975498
Adds attack animation calls for a few common machines and structures
...
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
mwerezak
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
8871696c52
Merge pull request #9353 from Ccomp5950/goat_simulator3000
...
Goat Buffs.
2015-05-19 17:56:55 +03:00
mwerezak
defc4c1f94
Adds check_charge(), checked_use()
2015-05-18 20:09:09 -04:00
mwerezak
53855d2398
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge
2015-05-18 18:47:45 -04:00
PsiOmegaDelta
ce8188c1a2
Merge pull request #9350 from Hubblenaut/lockers
...
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
Hubblenaut
ac1f3c3530
Fixes overbloated closets
2015-05-18 18:34:25 +02:00
PsiOmega
e2e0ffc6e5
Compilation fixes.
2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
PsiOmegaDelta
a7d72940cf
Merge pull request #9348 from Baystation12/master
...
Dev-freeze
2015-05-18 17:48:36 +02:00
Chinsky
6169c49832
Merge pull request #9143 from Loganbacca/qol_mule
...
[QOL] MULE destination selection
2015-05-18 18:20:17 +03:00
Daranz
e13bc6ab54
Add access_medical_equip to get_all_accesses()
2015-05-18 08:33:51 -04:00
Chinsky
a3a2c615de
Merge pull request #9300 from PsiOmegaDelta/RoundStart
...
Gamestart cleanup.
2015-05-18 12:00:49 +03:00
ccomp5950
53e52a6f92
Goat Buffs.
...
Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
2015-05-18 04:35:19 -04:00
Zuhayr
3ed1917c3a
Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque.
2015-05-18 13:23:21 +09:30
Chinsky
b08fcb8d3e
Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking
...
Destroying a camera now also cuts wires randomly.
2015-05-18 00:40:56 +03:00
Mustafa Kalash
a5aede3b70
Gives IA agents bridge access and the HoS' encryption key. Changes IA agents' supervisor to Nanotrasen officials and regulations.
2015-05-17 12:43:20 -04:00
Zuhayr
59bfc08853
Merge pull request #9317 from Dennok/patch-1
...
Fix connector updates
2015-05-18 00:21:47 +09:30
Zuhayr
8917a03380
Merge pull request #9296 from PsiOmegaDelta/TurfProcessing
...
Turf processing
2015-05-17 22:51:45 +09:30
Zuhayr
4ea779ae6c
Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
...
Cleans up welder code.
2015-05-17 20:21:31 +09:30
