Zuhayr
00ede5d475
Merge pull request #9477 from comma/dev-freeze
...
Moved Captain's announcment out of equipping to spawning.
2015-05-28 03:09:25 +09:30
Zuhayr
c62514887b
Merge pull request #9481 from PsiOmegaDelta/150526-Inactivity
...
Inactivity process tweaks.
2015-05-27 13:24:22 +09:30
Chinsky
3d5b7e5744
Merge pull request #9464 from Kelenius/ofChemAndAnalyze
...
Medical scanners now scan ingested reagents
2015-05-27 06:32:20 +03:00
PsiOmega
98c585615e
Inactivity process tweaks.
...
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02: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
Chinsky
f1c194d5e9
Moved Captain's announcment out of equipping to spawning. Removed redundant satchel spawning things - they are being taken care of in job's equip()
2015-05-26 09:11:04 +03:00
StarSmasher
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
Kelenius
359e055463
Lets medical scanners scan stomach
2015-05-25 19:11:14 +03: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
PsiOmegaDelta
2fc50e7d03
Merge pull request #9449 from mwerezak/airlock-sound
...
Airlock sounds
2015-05-24 14:43:09 +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
Zuhayr
50dd6aa0bb
Merge with master.
2015-05-23 21:29:40 +09:30
Zuhayr
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
PsiOmega
77099631d1
Updates del usages.
2015-05-22 08:27:12 +02: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
mwerezak
cf591c290b
Adds limit to prevent random walking below the lower limit temperature, too.
2015-05-22 02:21:12 -04:00
mwerezak
4d54742079
Fixes portable generators going about their temperature limit
2015-05-22 01:27:01 -04:00
PsiOmegaDelta
a677ec3b83
Merge pull request #9412 from Kelenius/ofChemAndReadme
...
Updates Chemistry-Readme.dm
2015-05-22 06:37:25 +02:00
PsiOmega
7d17f2eeb7
Items again have their loc set just before dropped() is called.
...
Fixes #9299 .
Fixes #9406 .
2015-05-21 17:55:31 +02:00
Daranz
e9d9ff57ba
Remove redundant null argument in a view() call
2015-05-21 10:14:40 -04:00
Daranz
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
Daranz
b9dbeeb356
Fix a problem with Say :i not working
2015-05-21 08:53:14 -04:00
Kelenius
360113850a
Updates Chemistry-Readme.dm
...
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03: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
Zuhayr
52ae206174
Merge pull request #9391 from comma/ghettoMD
...
Missed one baddie
2015-05-21 18:30:06 +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
Chinsky
53e3e2f6e6
Merge pull request #9379 from Zuhayr/materials
...
Materials + Morguemeat icon + bat nerf
2015-05-21 03:23:41 +03:00
Chinsky
97b2a63b76
Missed one baddie
...
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
Chinsky
9d14bc41de
Merge pull request #9389 from mwerezak/fire
...
Fire
2015-05-21 03:13:55 +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
9888a8a70b
Another PoolOrNew(new /type, loc) fix
2015-05-20 16:49: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
