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
Atlantis
1da44dc861
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
...
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
2015-05-24 20:23:46 +02: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
Atlantis
c2c3a2c689
Implements remaining suggestions
...
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
2015-05-24 03:05:27 +02:00
Atlantis
da22851ff7
Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge
2015-05-24 01:16:09 +02:00
Atlantis
ef040583c8
Implements github suggestions
...
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
2015-05-23 22:22:38 +02:00
Atlantiscze
5aa37bd859
Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge
2015-05-23 21:22:23 +02:00
Atlantiscze
06ec54c7b8
Modified behavior of machine overload to further prevent spam and to make it more useful if targeted on high-power machinery such as SMES.
...
- This is a WIP thing. Commiting so i can finish it on my second computer.
2015-05-23 21:19:32 +02: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
Atlantis
97f0470504
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-22 21:01:26 +02:00
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
Atlantis
d8141445e4
Implements suggestions
...
- Hardware examine is now generated by hardware's proc.
- Camera network updating now uses proper procs
- Bugfix: APU Generator no longer prevents you from using NanoUI based devices
- Bugfix: Fixes rare runtime on roundstart.
2015-05-21 13:27:18 +02:00
Atlantis
991546df2a
Span Class in shields code.
2015-05-21 12:19:23 +02: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
Zuhayr
c3f0f42ec2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials
2015-05-21 00:49:14 +09:30
