03f3d9b5c1
Merge branch 'virgoMaster' into virgoPull
2018-03-12 18:41:26 -07:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
4538a6859f
POLARIS: Use drop_location() for things
2018-03-08 13:03:09 -05:00
10a9793fdb
Merge pull request #3177 from aztectornado/syringe-case
...
Adds quickdraw objects and syringe cases
2018-03-05 18:36:27 -05:00
2d0872b524
Adds quickdraw objects and syringe cases
2018-03-04 18:58:34 -06:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
6ff1f1b165
fixes #4992 ( #4995 )
...
i'm good at this i swear
2018-03-02 18:24:51 -08:00
c2be6a7575
More standardized grammar ( #4977 )
2018-03-02 18:24:15 -08:00
84d66c51df
DNA injectors cause cloneloss. ( #4958 )
2018-03-01 12:49:11 -08:00
3004093a50
Make syringe reuse a bad idea
...
Because now it can infect limbs and transfer viruses
2018-02-28 20:03:18 -05:00
36540182df
Merge pull request #4965 from Belsima/techy
...
Adds illegal and other tech to some implants.
2018-02-28 14:17:17 -06:00
2ab9bfe79b
Turns the station into 420-station 13. ( #4971 )
...
* adds rolling paper and joints
F O U R T W E N T Y B L A Z E I T
* adds joint sprites
(they're pretty bad though)
* adds rolling paper box, adds papers to cig vendors
* c h a n g e l o g
smoke
weed
every
day
2018-02-28 14:16:42 -06:00
3fe17274d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/ATMOSPHERICS/pipes.dm
# code/game/turfs/flooring/flooring.dm
# code/modules/clothing/clothing_accessories.dm
# code/modules/mob/living/carbon/human/inventory.dm
# html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
d345a60ad7
Merge pull request #4960 from Nerezza/Shutter-tape
...
Makes tape appliable to hazard shutters just like airlocks
2018-02-27 17:45:11 -08:00
48c6161c4d
Adds umbrellas to loadout, for 3 points
2018-02-26 12:39:56 -08:00
d1aa9affe4
Merge pull request #4953 from Schnayy/trinketbox
...
Trinket box
2018-02-26 10:04:14 -06:00
59e07f941e
Implant Tech
2018-02-26 09:23:18 -05:00
413e832825
Makes tape appliable to hazard shutters just like airlocks
...
Clicking hazard shutters with tape will tape them up like airlocks, instead of opening them (if you have the access to).
2018-02-25 14:46:32 -06:00
a42d7ecdb4
Merge pull request #4944 from VOREStation/pol-matweak
...
Tweak weird MA override
2018-02-25 12:38:58 -06:00
460202cb6e
Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict.
...
https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png
Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.
2018-02-25 01:57:03 -06:00
8315c0b92f
Merge pull request #4938 from Anewbe/bombs_again
...
Further Package Bomb adjustments
2018-02-24 22:55:40 -08:00
f29484f8da
Merge pull request #3117 from VOREStation/aro-fbpcells
...
Adds a synth backup cell to synth survival box, plus goggles
2018-02-24 14:43:48 -05:00
f6d65ec0b8
Merge pull request #3114 from VOREStation/aro-matweak
...
Tweak MA constructor
2018-02-24 14:43:26 -05:00
19cffffdc3
VS: Synth goggles in survival box
2018-02-24 14:14:35 -05:00
4ebbf1ce7a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
...
# Conflicts:
# maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
542bb57d0d
POLARIS: Tweak weird MA override
...
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
2018-02-24 13:13:10 -05:00
2553edc2a0
Merge pull request #4932 from VOREStation/pol-box2
...
Small tweak to survival boxes
2018-02-24 11:02:07 -06:00
8ccf0f7532
AlliCo Hallmark Goods ( #4887 )
...
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.
Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png
Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.
Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.
Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.
Items & Reagents added:
- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.
Side note, mapping things in is scary!!!
* In the process of fixing the map merger nonsense w/ mechoid's help.
* We're almost there lads.
* If this doesn't work I'll cry.
* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.
* REVERTING ITEMS.DMI. Attempting to fix conflict.
* Recommitting items.dmi
* One last attempt to fix the conflict before I make some bigger changes to get this through.
* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.
* now with 20% less silly
2018-02-24 11:01:23 -06:00
9bc7510e26
POLARIS: Tweak weird MA override
...
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
2018-02-24 11:44:57 -05:00
d92fb517cd
Merge pull request #4936 from VOREStation/vplk-sundry-fixes-feb
...
Sundry Bugfixes - Feburary
2018-02-23 23:53:03 -06:00
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
4f6074f2ae
Further Package Bomb adjustments
2018-02-23 20:48:30 -06:00
328a7c54df
Merge pull request #4926 from VOREStation/vplk-gas-turbine
...
Make gas turbine constructable and operational
2018-02-23 13:16:56 -06:00
9e20ead03a
Small tweak to survival boxes
...
Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those).
2018-02-23 11:51:11 -05:00
a1bfd1fb46
Make gas turbine constructable and operational
...
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
2018-02-22 15:43:38 -05:00
32c177b66f
Stop candles from messaging the universe when they light.
2018-02-22 15:25:39 -05:00
581bee4909
Fix runtime when clicking RCD on almost anything.
...
- get_base_turf_by_area() must only be called on turfs!
2018-02-22 15:25:33 -05:00
1c7a9c6837
Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts.
2018-02-22 15:25:33 -05:00
0d4452e78f
Merge pull request #3098 from VOREStation/vplk-candles
...
Stop candles from messaging the universe when they light.
2018-02-22 12:27:58 -05:00
94cdc508bc
Merge pull request #3068 from VOREStation/vplk-timeclock-i
...
Adds Timeclock Terminals: A machine for viewing your PTO balance.
2018-02-22 12:27:09 -05:00
effd302072
Stop candles from messaging the universe when they light.
2018-02-22 10:17:49 -05:00
51420a0aa7
Flashbangs no longer Stun()
2018-02-22 02:20:25 -06:00
01ae959020
Merge pull request #4865 from Atermonera/umbrella
...
Adds umbrellas
2018-02-21 23:06:44 -06:00
21592606b7
Merge pull request #4898 from Mechoid/Mining_Optimization
...
Mining Bag / Box Speedification
2018-02-21 16:15:16 -06:00
dfdafddaa9
Merge pull request #4897 from VOREStation/pol-analfix
...
Fix health analyzer names
2018-02-21 10:03:09 -06:00
a6653bf00a
Merge pull request #4896 from VOREStation/pol-qdels
...
Fix several Destoy()s
2018-02-21 10:01:23 -06:00
3fdafb7194
Rename medical scanners and update map
2018-02-20 19:25:31 -05:00
d3cc476eb0
Un-fub comments.
2018-02-20 13:57:51 -08:00
8a3dcc5cc1
Makes Mining Satchels brute-force their way out of lagging, minerborg prodding.
2018-02-20 12:58:13 -08:00
0c0f09fe68
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
Reddeyfish
