Commit Graph

8663 Commits

Author SHA1 Message Date
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
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
Zuhayr
1ea2acc24b Fixes #7392 2014-12-31 19:34:53 +10:30
Chinsky
1619c09b66 Merge pull request #7588 from mwerezak/door
Fixes door hitby() ignoring speed parameter, small mult-tile door improvement
2014-12-31 08:33:05 +03:00
Chinsky
fe403d013b Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
mwerezak
0a78703ee2 Fixes door hitby() ignoring speed parameter 2014-12-31 00:12:22 -05:00
mwerezak
20a5e60b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze 2014-12-31 00:10:01 -05:00
Zuhayr
a5b937c1e8 Readded null check. 2014-12-31 14:12:10 +10:30
Ccomp5950
e0047c5830 Merge pull request #7545 from atlantiscze/blast-door-refactor
Blast Door refactor
2014-12-30 21:15:47 -05:00
Zuhayr
a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Zuhayr
c73d3e9e16 Prevents power drain from functioning on atmos canisters. (#7567) 2014-12-30 16:09:50 +10:30
Atlantiscze
90a83c19cf Hardsuit powersink module now uses CELLRATE properly
- Adds CELLRATE (and SMESRATE for SMESs) into drain_power proc.
- Adds "amount" parameter to drain power proc, sets the powersink module to 40kW draw (80 cell charge/s), which should correspond with normal cell recharger.
- Removes drain_power from all machinery, and adds drain_power to machinery/power. This means you can only drain from machines that have something to do with wiring or electricity.
2014-12-29 20:40:57 +01:00
Atlantiscze
a9e1f920fd Powersink Load Fix
- Apparently i forgot to add check for used amount of power when reworking powersink, causing it to drain 2kW from each APC, even above drain cap.
2014-12-29 20:36:50 +01:00
Zuhayr
c7f0d7cfc7 Merge resolution. 2014-12-30 05:52:59 +10:30
mwerezak
da41c1980d Slightly better multi_tile airlock handling
No need to mess with lists
2014-12-29 13:32:31 -05:00
Atlantiscze
84909f2fbd NOCLONE -> HUSK 2014-12-29 15:58:21 +01:00
Atlantiscze
301af06033 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor 2014-12-28 23:50:15 +01:00
Zuhayr
505d84049c Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly. 2014-12-28 19:16:07 +10:30
Zuhayr
1ea83f4365 Removed the DNA2 debug message in the dream daemon console. 2014-12-28 18:32:38 +10:30
Zuhayr
fabee2fdf8 Stopped glass shards from proning mobs with NO_PAIN. 2014-12-28 17:32:55 +10:30
Zuhayr
a7f47e32d7 Merge pull request #7534 from mwerezak/doors
Doors and stacks
2014-12-28 13:14:23 +10:30
Atlantiscze
5c60361f24 Changeling Fix
- Fixes #7550 and one other bug which is not on issue tracker
- Uncomments one line of code which caused #7550, considering reasons for this being commented out no longer apply. (parasting is no longer cheap OP ability you have from start) Changeling rewrite is probably going to occur soon anyway.
- Removes one line which caused bug with "Absorb" ability - victim was immediately absorbed after the "You stab the X with proboscis" part, instead of waiting few seconds as it should.
2014-12-27 15:16:40 +01:00
Atlantiscze
028fc13fa1 Repair time adjustment
- 10s delay changed to 3s
2014-12-27 01:38:46 +01:00
Atlantiscze
1ed3a3d998 Icon States
- Again, i know. I am an idiot. Changed animation icon states to proper ones.
2014-12-27 01:00:29 +01:00
Atlantiscze
348fd00da1 Minor Adjustments
- Fixes updateicon issue
- Adds notification when trying to crowbar working blast door.
2014-12-27 00:49:27 +01:00
Atlantiscze
8ff480657f Blast Door Repairing
- Blast doors can now be repaired with plasteel. 1 sheet repairs up to 150 HP of damage, or up to 10 emitter blasts damage.
2014-12-27 00:40:47 +01:00
Zuhayr
931682f926 Fixes #7327 2014-12-27 10:01:17 +10:30
Atlantiscze
07b5b7af8b Updates references
- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
2014-12-27 00:03:20 +01:00
Atlantiscze
17a4425c72 Blast Door Refactor
- Blast doors completely refactored and moved to one file.
- Subtypes can be easily created by modifying few variables, instead of overriding ton of procs every time
- TODO: Add dedicated repair for blast doors, using Plasteel.
- Code properly commented, viva la understandable code.
2014-12-26 23:42:11 +01:00
mwerezak
07debf9405 Adjusts door repair to use a welding tool 2014-12-25 15:31:15 -05:00
mwerezak
f297f7cd0a Stack reorganization, use() now dels after yield
stack/use() now only deletes an empty stack after the current context
yields, removing the need for some awkward patterns when dealing with
stacks. Also adds procs for transferring and splitting stacks.
2014-12-25 15:09:09 -05:00
mwerezak
64e26b2dbd Fixes robot stacks transferability
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr
f4ada7b869 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-25 20:05:01 +10:30
Atlantiscze
4ba6e20b04 Fixes shutters texture when damaged
- Damaged shutters no longer transform into blast doors.
- Fixes #7443
2014-12-25 01:37:21 +01:00
SkyMarshal
fee93bba38 Fix bloody extinguisher bug. 2014-12-24 16:24:16 -07:00
PsiOmegaDelta
3427787359 Merge pull request #7524 from Zuhayr/mutantrace
Species and organ fixes.
2014-12-25 10:56:17 +13:00
Zuhayr
0263bc9c84 merge 2014-12-24 22:50:13 +10:30