50dd6aa0bb
Merge with master.
2015-05-23 21:29:40 +09:30
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
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
cf591c290b
Adds limit to prevent random walking below the lower limit temperature, too.
2015-05-22 02:21:12 -04:00
4d54742079
Fixes portable generators going about their temperature limit
2015-05-22 01:27:01 -04:00
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
defc4c1f94
Adds check_charge(), checked_use()
2015-05-18 20:09:09 -04:00
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
f9306431b7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2015-05-14 22:20:58 +02:00
3d1b671703
Asking for more energy than a cell has stored now drains the cell.
...
Fixes #9252 .
2015-05-13 23:38:49 +02:00
ad67215b08
Merge pull request #9073 from PsiOmegaDelta/QDels
...
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
b15ff78302
Merge pull request #9130 from mwerezak/device-powercell
...
Adjusts charge cost for energy type guns
2015-05-12 18:11:39 +09:30
66ead991e7
Terminals, scrubbers, airlocks, and alarms get a Destroy() review.
2015-05-12 08:16:30 +02:00
c06323ef7a
Merge pull request #9199 from Techhead0/voidmachine-englishlists
...
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
2015-05-12 14:20:37 +09:30
0d9a482be8
Removes frame_desc from circuitboards.
2015-05-12 00:09:51 -04:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
7780287d3a
mood lighting for computers
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:29 +01:00
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
733c6a4fb5
simulated var for atoms, used to filter explosions and other actions
...
kind of a stronger anchored var, used by lighting overlays
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:30 +01:00
5b92057890
lights in areas that don't require power will now automatically turn on
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
3e1e137cec
Adds device powercells
...
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
2015-05-06 23:41:57 -04:00
4afe2e46e6
Updates code based off of GinjaNinja's Feedback
2015-05-05 17:16:10 +02:00
2675bac50e
Applies Icon Caching to battery racks, Fixed edition
...
I did a whoops, should be good now, I hope.
2015-05-05 16:50:23 +02:00
82b810d363
Revert "Applies Icon Caching to battery racks"
2015-05-05 15:36:19 +01:00
b27dbdaaf5
I'm too broken for this
...
Also fixes this one, probably.
2015-05-05 14:21:28 +02:00
1c9dbfdb2b
Removes unneeded variable
...
All good now.
2015-05-05 14:13:26 +02:00
89b65e216f
Applies Icon Caching to battery racks
...
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.
Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
2015-05-05 13:12:52 +02:00
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
afa82e5d83
Merge pull request #9003 from mwerezak/dev-fixes
...
Fixes
2015-04-28 06:26:22 +03:00
36d9944dfd
Fixes #8977
2015-04-27 14:55:18 -04:00
290a7d5000
Fixes #8536
...
Also removes a bunch of redundant comments
2015-04-27 01:11:40 -04:00
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
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
0b03a389df
Merge pull request #8910 from Baystation12/master
...
Master into dev
2015-04-19 17:26:04 +09:30
0e0d13f1b1
Fixes #8490 .
...
Now properly calls update icon on EMP effect changes.
2015-04-18 12:01:32 +02:00
858b56a2e5
The Nar-Sie summoning ritual is now animated.
2015-04-17 08:04:59 +02:00
Zuhayr