cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 15:36:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,771 Commits 66 Branches 25 Tags
9f21628619f87f85e176e62fd9b89eee4acaa61a
Commit Graph
643 Commits
Author SHA1 Message Date
Verkister 9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
AtermoneraandGitHub b63acc083d Merge pull request #5143 from VOREStation/fix-usr 
Reverted use of 'usr' back to 'user' from commit 05fd53e
 2018-04-04 17:35:33 -07:00
AtermoneraandGitHub a059ed0de3 Merge pull request #5133 from Cameron653/patch-1 
Syndicate Dufflebag Tweak
 2018-04-02 23:51:21 -07:00
Leshana 1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
MechoidandGitHub 739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets 
Wallet Expansion!
 2018-04-01 15:01:05 -07:00
Cameron653andGitHub 4a1ef0dbd6 Makes syndie dufflebags hint that they let you move faster 2018-03-31 11:02:01 -04:00
Leshana 6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
mistyLuminescence dfc0dd48bc Removes vials 2018-03-30 02:12:58 +01:00
AtermoneraandGitHub 6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear 
Adds permanent markers
 2018-03-28 11:49:10 -07:00
Arokha Sieyes 29eb468ef5 POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles 2018-03-25 17:05:20 -04:00
Cameron653andAtermonera 59844c5553 Xenoarch Multitool & Xenoarch Excavation Drill (#5058) 
* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m
 2018-03-22 09:50:50 -07:00
Arokha Sieyes 3cc7138ca3 POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles 2018-03-20 19:01:36 -04:00
Billy Bangles d953a58413 travis pls 
why must we argue so
 2018-03-19 21:23:48 -04:00
Billy Bangles 05fd53ebcc adds permanent markers 
also tweaks paint recipe to use ink instead of crayons.
 2018-03-19 20:20:31 -04:00
mistyLuminescence 8769f4605a trims list 2018-03-18 03:20:36 +00:00
mistyLuminescence 70f7ef7d6f Wallet expansion! 2018-03-17 21:10:23 +00:00
AnewbeandGitHub d36e67d90d Merge pull request #5064 from VOREStation/vs-port-3142 
[PORT] Improved playsound and drop_location() from /tg
 2018-03-17 15:01:07 -05:00
AtermoneraandGitHub 4fa4173e29 Merge pull request #5049 from Anewbe/quickdraw_items 
Ports quickdraw storage items from VIRGO
 2018-03-16 11:37:58 -07:00
Leshana a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe 5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha SieyesandLeshana 6158cd1d26 POLARIS: Use drop_location() for things 2018-03-13 19:23:46 -04:00
Anewbe a8cc2df4ad Ports quickdraw storage items from VIRGO 2018-03-11 16:56:17 -05:00
Arokha Sieyes 306a484b48 U_I Phase 2.4: Storage cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes 3be602dece U_I Phase 1.3: Previews are broken, so that's a thing 2018-03-08 19:31:55 -05:00
Arokha Sieyes 2f433c9ea9 U_I Phase 1.2: Something is broken somewhere 2018-03-08 19:31:54 -05:00
Arokha Sieyes 94c2110f27 U_I Phase 1.1: Fix phase 1 bugs 
Softsuits making your clothes disappear, PDAs in ID slot making you double
 2018-03-08 19:31:54 -05:00
Arokha Sieyes aa9ec19118 U_I Phase 1.0: First consolidation pass 2018-03-08 19:31:43 -05:00
Arokha Sieyes 4538a6859f POLARIS: Use drop_location() for things 2018-03-08 13:03:09 -05:00
Aronai SieyesandGitHub 10a9793fdb Merge pull request #3177 from aztectornado/syringe-case 
Adds quickdraw objects and syringe cases
 2018-03-05 18:36:27 -05:00
Aztectornado 2d0872b524 Adds quickdraw objects and syringe cases 2018-03-04 18:58:34 -06:00
Arokha Sieyes 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
BillyBanglesandAtermonera 6ff1f1b165 fixes #4992 (#4995) 
i'm good at this i swear
 2018-03-02 18:24:51 -08:00
Arokha Sieyes 3004093a50 Make syringe reuse a bad idea 
Because now it can infect limbs and transfer viruses
 2018-02-28 20:03:18 -05:00
BillyBanglesandAnewbe 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
Arokha SieyesandLeshana 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
AnewbeandGitHub d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox 
Trinket box
 2018-02-26 10:04:14 -06:00
AnewbeandGitHub a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00
Schnayy 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
Aronai SieyesandGitHub 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
Aronai SieyesandGitHub f6d65ec0b8 Merge pull request #3114 from VOREStation/aro-matweak 
Tweak MA constructor
 2018-02-24 14:43:26 -05:00
Arokha Sieyes 19cffffdc3 VS: Synth goggles in survival box 2018-02-24 14:14:35 -05:00
Leshana 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
Arokha Sieyes 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
AnewbeandGitHub 2553edc2a0 Merge pull request #4932 from VOREStation/pol-box2 
Small tweak to survival boxes
 2018-02-24 11:02:07 -06:00
SchnayyandAnewbe 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
Arokha Sieyes 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
Leshana 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
Arokha Sieyes 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
Leshana 1c7a9c6837 Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts. 2018-02-22 15:25:33 -05:00