Mloc-Argent
537b78fc80
refactor buckling to be more generic
...
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
pipes and they will automatically unbuckle if the cuffs are removed.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-12 21:28:31 +00:00
Zuhayr
a539780086
Merge pull request #7759 from Baystation12/dev-freeze
...
Dev < Dev freeze
2015-01-10 04:58:48 +10:30
Zuhayr
b36b41a2f5
Fixes #7656
2015-01-09 03:58:43 +10:30
Zuhayr
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
Zuhayr
0d56551319
Merge pull request #7729 from Baystation12/dev-freeze
...
Dev freeze
2015-01-07 18:15:03 +10:30
Zuhayr
07298fa31a
Merge pull request #7697 from Tramziller/dev-freeze
...
Shot airlock fix
2015-01-07 06:02:06 +10:30
ccomp5950
27765f799f
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflict resolution.
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr
cb88860f6b
Merge resolution.
2015-01-07 03:43:12 +10:30
Mloc
7570cf7ea7
Merge pull request #7708 from comma/master
...
Fixes #7707
2015-01-06 15:28:32 +00:00
Chinsky
38c69bab64
Fixes #7707
2015-01-06 13:14:20 +03:00
Zuhayr
66759eff3c
Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text.
2015-01-06 11:11:34 +10:30
Tramziller
be48eccad2
Airlock that are BROKEN (shot or like) can have their electronics removed (for repairs) even when their bolts are dropped
2015-01-05 20:39:00 +01:00
mkalash
559e224446
Allows the autolathe maintenance panel to be accessed even if disabled. Fixes #7677 . Adds feedback when a someone tries to interact with a disabled autolathe with the panel closed.
2015-01-04 22:43:20 -05:00
mkalash
536e4bd237
Adds missing paranthesis in logic for airlock's hasPower(). Fixes #7653
2015-01-04 22:09:00 -05:00
mkalash
6e8d2c55b0
Adds stack amount check when loading materials into the exosuit fabricator. Fixes #7665
2015-01-04 21:34:50 -05:00
PsiOmegaDelta
d1d88fa365
Merge pull request #7687 from Tramziller/Girder_fix
...
Fixes bug where girders can be destroyed with stun beams.
2015-01-04 23:50:36 +01:00
Mloc
ec9b46399b
Merge pull request #7673 from SkyMarshal/patch-3
...
Fixes runtime with deleted cameras.
2015-01-04 21:06:42 +00:00
SkyMarshal
863351a474
Changes the runtime protection to be more general-case.
2015-01-04 13:32:11 -07:00
Tramziller
fb86581159
Fixes bug where girders can be destroyed with stun beams.
2015-01-04 21:12:32 +01:00
Zuhayr
9fa73784a5
Fixes #7660
2015-01-05 01:05:13 +10:30
Zuhayr
f7cd72b7f9
Fixes #7670
2015-01-04 19:06:45 +10:30
Zuhayr
81603032d3
Fixes #7671
2015-01-04 19:05:55 +10:30
SkyMarshal
65163dfcc5
Fixes runtime with deleted cameras.
2015-01-04 01:22:37 -07:00
PsiOmegaDelta
fedc8eab16
Merge pull request #7651 from Kelenius/ofFloorbotsAndFootprints
...
Of floorbots and footprints
2015-01-04 08:57:02 +01:00
mkalash
6d9c2671b9
Copies extinguisher code to exosuit extinguisher, fixes #7603
2015-01-04 00:43:19 -05:00
Kelenius
080dfc7850
Removes duplicated code from blood decals
2015-01-04 00:59:33 +03:00
Zuhayr
af432c0c42
Merge pull request #7650 from Mloc/bs12-sleepyedges2
...
kludge for freezing zas, pending share_ratio fixes.
2015-01-04 07:51:45 +10:30
Kelenius
1ac8beb18d
Makes floorbots clean footprints, makes footprints dry out
...
Fixes #5944
2015-01-04 00:20:00 +03:00
Mloc-Argent
c55b7ec7c8
kludge for freezing zas, pending share_ratio fixes.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-03 21:16:12 +00:00
Zuhayr
982998d08d
Fixes #7636
2015-01-03 06:53:29 +10:30
Zuhayr
ce1a90c584
Fixes #7635
2015-01-03 06:43:15 +10:30
Zuhayr
2c82daa594
Fixes #7599
2015-01-03 06:30:43 +10:30
Chinsky
5e0676df49
Merge pull request #7631 from Zuhayr/dev-freeze
...
More fixes.
2015-01-02 20:52:27 +03:00
Chinsky
f30981ab71
Merge pull request #7610 from Loganbacca/trainfixes
...
Cargo train fixes
2015-01-02 20:51:19 +03:00
Zuhayr
a255fe48ca
Fixes #7619
2015-01-02 19:28:30 +10:30
Zuhayr
261f3f935c
Fixes #7627
2015-01-02 19:19:01 +10:30
mwerezak
f9344a5a2d
Atmos machine update
...
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.
Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.
Also, further refactoring.
2015-01-02 01:46:18 -05:00
Zuhayr
fc75f3bdfc
Merge pull request #7620 from mwerezak/poster
...
Fixes #7598
2015-01-02 09:00:16 +10:30
mwerezak
6eceb15fe6
Merge remote-tracking branch 'upstream/dev-freeze' into poster
...
Conflicts:
code/game/turfs/simulated/walls.dm
2015-01-01 15:46:23 -05:00
mwerezak
9485c6410c
Fixes #7598
2015-01-01 15:43:28 -05:00
Zuhayr
5b578a1668
Merge resolution.
2015-01-01 22:59:54 +10:30
Loganbacca
dbeec8915e
Cargo train fixes
...
- Partial fix for #6634
- Fixes #7414
- Fixes #7609
2015-01-02 00:05:47 +13:00
Atlantiscze
1a1963e292
Adjustments to RCON console UI
...
- Adds buttons to show/hide specific sections of the UI.
2015-01-01 08:40:47 +01:00
Atlantiscze
2580db82b5
Removes debug statement
...
- Forgot to add this into my previous commit.
2015-01-01 07:54:04 +01:00
Atlantiscze
a17656086c
Fixes #7349
...
- This fixes missing powernet sensor entries in engineer PDAs.
- This is done by reimplementing old system, that instead connected to consoles. Bleh.
- New system connects directly to sensors, but offers only very limited amount of information (ie. console is 5x better and nicer, this is intentional before someone begins yelling it's a bug!)
2015-01-01 07:52:44 +01:00
Zuhayr
cdfa2a5205
Merge pull request #7586 from Zuhayr/dev-freeze
...
Fixes the remainder of #7567 , plus other fixes.
2014-12-31 22:48:39 +10:30
PsiOmegaDelta
12053e739c
Merge pull request #7590 from mwerezak/walls
...
Less wall and door destruction snowflake, allows obj to damage walls
2014-12-31 11:29:28 +01:00
Zuhayr
1ea2acc24b
Fixes #7392
2014-12-31 19:34:53 +10:30
mwerezak
d240f6563d
Throwing speed defines
2014-12-31 02:02:49 -05:00
mwerezak
756d79b7f3
Less airlock destruction snowflake
...
Removed the secured_wires multiplier to emitter_hits because it doesn't
make sense that swapping out a different kind of electronics should
affect the door being destroyed. If certain doors should be resistant
then that can be changed in mapping.
2014-12-31 00:43:58 -05:00
