38e7cb8774
Minor amendments to mech kits and icons.
2015-05-13 17:04:52 +09:30
93767c589e
Adds beanbag shells to bar backroom.
...
Also, fixes.
2015-05-13 03:30:07 -04:00
f41300bbe3
Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox
...
Conflicts:
maps/exodus-1.dmm
2015-05-13 03:10:36 -04:00
e38ef1c7ef
Moves survival boxes to species datums.
...
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
2015-05-13 02:31:17 -04:00
090112c874
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-13 06:17:26 +02:00
a9f936fe42
Added exosuit customisation kits to cargo.
2015-05-13 11:20:54 +09:30
165de0ad0e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts
2015-05-12 17:19:36 +02:00
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
9896bb4a9c
Cleanup of custom item icons.
2015-05-12 23:21:23 +09:30
57b5d43b4e
Merge pull request #9218 from Zuhayr/hailers
...
Allows hailer messages to be altered.
2015-05-12 15:00:36 +02:00
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
2222445eb3
Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites
...
Adds 7 new AI core sprites and adds new pAI card sprites.
2015-05-12 21:01:30 +09:30
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
084b2f7825
Merge pull request #9220 from comma/pruttyshiny
...
Useless lights galore
2015-05-12 17:30:38 +09:30
3b3f23e502
Useless lights galore, adding small/colorful lights:
...
Lamps (old-looking ones), flares now have different color from usual flashlight.
Lit cigs give 0.25 power light - just enough to stand out in full darkness.
Candles are colored too.
Different colors for different camera consoles instead of SUPER RED for everyone.
2015-05-12 10:23:24 +03:00
27f03d557f
Allows hailer messages to be altered.
2015-05-12 16:42:43 +09:30
f76a1d2024
Removed custom item defines, refactored mech kits.
2015-05-12 15:49:56 +09:30
51043bc84a
Update
...
- Creates a global list of items which have pwr_drain() called every powernet tick
- Makes powersink use this list
- Adds scheck
2015-05-12 07:49:31 +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
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
f9d28385d3
Fixes common channel radios not working.
2015-05-11 20:20:57 +02:00
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
d14904e1d6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/response_team.dm
code/modules/hydroponics/spreading/spreading.dm
code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
152156018a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-11 07:46:51 +02:00
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +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
9d883ea914
Corrects implanter attack log.
...
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
6906acf193
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two
...
Conflicts:
code/game/turfs/simulated/floor.dm
icons/mob/back.dmi
maps/exodus-3.dmm
polaris.dme
2015-05-10 04:21:37 -04:00
34eb2872b6
Makes the code compile by adding a comma and removing some unused lines.
2015-05-10 02:03:28 -05:00
89aa07fdf9
Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites.
2015-05-10 00:40:13 -05:00
b98461c2af
Station alarm monitor changes.
...
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
2015-05-08 11:22:29 +02:00
7cbd72d1be
Cleanup.
2015-05-07 09:09:12 +02:00
10edb06036
Do not copy-paste code.
...
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
9e4dacc765
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/machinery/machinery.dm
code/game/objects/items/weapons/storage/misc.dm
code/game/response_team.dm
html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02: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
d1b4289b74
Merge pull request #9118 from PsiOmegaDelta/HaltSecurity
...
Fixes #9065 .
2015-05-06 17:25:11 +03:00
4af458ef6c
Fixes #9065 .
...
Central Command ids now at least makes security equipment respect you.
2015-05-06 15:23:44 +02:00
767c6a151b
Fixes #9107 .
...
The empty donut box no longer uses a non-existing item state.
2015-05-06 15:06:19 +02:00
e9b32cf26e
Ensures drained_this_tick is actually set.
2015-05-06 12:30:05 +02:00
72ffea6fd3
Attempts to ensure the powersink remains processed correctly, moves processing disconnection into Destroy().
2015-05-06 12:25:50 +02:00
78a9a43de6
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/controllers/master_controller.dm
code/game/objects/items/devices/powersink.dm
2015-05-06 12:19:50 +02:00
024dabef7b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-05 22:13:58 +02:00
91e3ced65e
Powersink Fix
...
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of 1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
2015-05-05 18:49:11 +02:00
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
c4755548da
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
Conflicts:
maps/exodus-2.dmm
2015-05-03 16:09:58 -04:00
Zuhayr