Commit Graph

9542 Commits

Author SHA1 Message Date
Zuhayr
f06326556a Merge pull request #8838 from Dennok/patch-5
Pipelayer
2015-04-23 20:03:20 +09:30
Dennok
dfa0735c1d Remove .contents in loop. 2015-04-23 11:59:34 +03:00
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
7a8ae91c6a Makes crit oxyloss and malf AI time run in gametime instead of realtime. 2015-04-23 04:42:58 -04:00
Zuhayr
c7ec25e8f8 Merge pull request #8855 from comma/soundenv
Sound environments
2015-04-23 17:04:30 +09:30
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands
Updates backpacks to use the item_state overrides where necessary, fixes #8577
2015-04-23 03:26:18 -04:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
6cc8be6d90 Merge pull request #8936 from Dennok/patch-14
Automatic CableLayer
2015-04-23 07:34:00 +03:00
mwerezak
5b037670b3 Removes most instances of item_color
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
Dennok
813109af88 Add span classes 2015-04-22 23:30:46 +03:00
Dennok
b5317f398a Create floorlayer.dm 2015-04-22 23:16:20 +03:00
PsiOmega
4ce1ec1f3d Pipelayer feedback.
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
2015-04-22 16:49:54 +02:00
Dennok
dc19c22056 Fix 2015-04-22 11:27:18 +03:00
PsiOmegaDelta
7a27aece0d Merge pull request #8941 from Baystation12/master
Dev
2015-04-22 09:32:56 +02:00
Dennok
204e41a4fc Add code to CableLayer 2015-04-22 08:42:49 +03:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states
Fixes #8937
2015-04-22 05:21:03 +01:00
Dennok
ae978d6cea Create Cable Layer 2015-04-21 21:00:28 +03:00
Chinsky
bcfb746465 Merge pull request #8901 from PsiOmegaDelta/ShakeShake
Structure/table shaking.
2015-04-21 20:04:41 +03:00
Kelenius
446efb3809 Fixed attacking blob breaking logs 2015-04-21 19:57:45 +03:00
PsiOmega
eaa8e341f9 Makes it possible to shake structures people are climbing on to make them stop. 2015-04-21 17:45:09 +02:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed.
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
PsiOmega
3810bef4bf Merge remote-tracking branch 'upstream/master' into dev 2015-04-20 08:39:56 +02:00
Chinsky
b437c5654a Merge pull request #8902 from PsiOmegaDelta/FiredoorFixTwo
Another emergency shutter fix.
2015-04-19 16:10:07 +03:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3
sanitize() 3
2015-04-19 14:59:36 +03:00
Chinsky
109aed4fcf Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst
Fixes #8895.
2015-04-19 14:59:25 +03:00
Chinsky
a3962980ac Merge pull request #8898 from PsiOmegaDelta/eject_cartridge
Adds a PDA cartridge ejection verb.
2015-04-19 14:56:59 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master
Master into dev
2015-04-19 17:26:04 +09:30
Neerti
b178e56a3b Lazy fix because microwaves are terrible. 2015-04-18 22:04:05 -04:00
PsiOmega
27abc7404d Gives AI a personal atmospherics control subsystem.
Includes further work on NanoUI interactions.
2015-04-19 00:24:19 +02:00
PsiOmega
b295b9e3c6 Another emergency shutter fix.
I goofed, and dropped the distance check.
2015-04-18 20:13:25 +02:00
PsiOmega
804ca5aa0b Fixes #8250.
Uncomplicates the examine pre-check.
Ensures door/examine() returns the proper value.
2015-04-18 19:25:22 +02:00
PsiOmega
c39c929db7 Adds a PDA cartridge ejection verb.
The most requested feature.
2015-04-18 18:18:11 +02:00
PsiOmega
725e3335d2 Fixes #8895.
Laptops now use the proper proc for checking camera status.
2015-04-18 17:49:40 +02:00
volas
dbd239f4ec Corrections dual sanitizing 2015-04-18 17:49:25 +03:00
Chinsky
0206d6db8f Merge pull request #8868 from Jarcolr/patch-2
Fixes #8633
2015-04-18 17:44:22 +03:00
Chinsky
3819fe8d03 Merge pull request #8747 from Kelenius/ofJarsAndLizards
The return of the jars
2015-04-18 17:01:08 +03:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
PsiOmegaDelta
0b6affb274 Merge pull request #8877 from Jarcolr/patch-3
Fixes #8559
2015-04-18 15:55:45 +02:00
Chinsky
0d77262c69 Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob
Fixes #7943.
2015-04-18 16:55:06 +03:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze
Dev freeze into dev
2015-04-18 21:50:40 +09:30
PsiOmega
f5948f8bb6 Fixes #7943.
Access to engineering equipment is now enough to manipulate shield generators.
2015-04-18 11:52:03 +02:00
Den
1ff0eda601 Change dismantle turf to pipe turf. 2015-04-17 20:34:30 +03:00
Jarcolr
1cf3fa4c7a Fixes #8559
Device.dmi is where the sunflower icon is, this is targeting dev because it is ahead on master on this file.
2015-04-17 15:55:15 +03:00
Jarcolr
0030ca76af Spans instead of fonts.
Hopefully no typos.
2015-04-17 15:34:37 +03:00
PsiOmega
a6a428af6a Mecha + misc. Destroy() because I had already begun. 2015-04-17 09:55:59 +02:00
PsiOmega
4b040d93ba Continues the painful process of porting Destroy()s, Dels(), and everything else needed for qdel. 2015-04-17 09:47:19 +02:00
PsiOmega
858b56a2e5 The Nar-Sie summoning ritual is now animated. 2015-04-17 08:04:59 +02:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon
Fixes #8873
2015-04-17 03:18:53 +01:00
Den
1a000ea53c Add rework switch to list of pipe types. 2015-04-16 20:54:12 +02:00