cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 20:46:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,250 Commits 66 Branches 25 Tags
Upstream-Sync
Commit Graph
1998 Commits
Author SHA1 Message Date
Arokha Sieyes 2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Leshana 29f93b0800 Fix un-eqipping gear with a single click. 
- Restored this functionality to the way it was, with the exception of uniforms.  That drops everything when you remove it, so is still protected.
 2018-03-08 00:33:43 -05: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
BelsimaandAtermonera c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Aronai SieyesandGitHub dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo 
Adds 'Intercom Convo' verb
 2018-02-27 21:48:39 -05:00
Arokha Sieyes 0c4cc6811a VS: Convert some VS things to use global_announcer 2018-02-27 21:30:06 -05: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
SchnayyandAnewbe 36236e1883 Sivian Western Sprite Pack (#4970) 
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
 2018-02-27 14:24:20 -06:00
Arokha Sieyes f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00
NeertiandGitHub 355aaec3d2 Merge pull request #4950 from Anewbe/yet_another_fix 
Should be able to attach accessories by clicking the target item again
 2018-02-25 14:11:43 -05:00
SchnayyandAnewbe 643ba39d73 Prommie Cohesion Suits (#4937) 
* Adds prommie cohesion suits. Still need tesh sprites + loadout.

* adds the tesh sprites + loadout option.

* Renammed cohesion suits & icon files.

* Almost forgot to adjust the bird file names. There we go.

* Removed redundant line
 2018-02-25 11:26:02 -06:00
Anewbe 0b8dfae30b Null checks and tears 2018-02-25 02:25:06 -06:00
AnewbeandArokha Sieyes 86e45005bd More accessory runtimes and bugfixes 2018-02-24 20:02:55 -05:00
AnewbeandArokha Sieyes ff2496a2e6 Should be able to attach accessories by clicking the target item again 2018-02-24 20:02:38 -05:00
Anewbe bbd870e502 More accessory runtimes and bugfixes 2018-02-24 18:38:11 -06:00
Anewbe 7b87cd61a6 Should be able to attach accessories by clicking the target item again 2018-02-24 17:39:16 -06: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
Anewbe 99312f323d Should fix an accessories oversight 2018-02-23 22:22:53 -06: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
Anewbe 8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Cameron653andGitHub f15195cded Whoops 2018-02-21 16:50:26 -05:00
Cameron653andGitHub 031c30d06d Adds a toggle to the bluespace jumpsuit 2018-02-21 16:43:57 -05:00
AnewbeandAtermonera 67261d40f3 Adds planetside gun permits (#4879) 2018-02-20 12:37:03 -08:00
AnewbeandAtermonera 0261cc4771 Explorer gasmasks can be equipped through their hoods (#4867) 2018-02-20 12:36:05 -08:00
Arokha Sieyes cdd2030811 POLARIS: Ports Bay's wall-mounted air pumps 2018-02-18 13:24:23 -06:00
Arokha Sieyes 33539aa0f4 POLARIS: Ports Bay oxygen/anesthetic pumps 2018-02-18 13:14:57 -06:00
Anewbe cce3c607f2 HoS/Warden helmet tweaks 2018-02-17 15:57:26 -06:00
Leshana ef3df27528 VOREStation Specific Merge Changes 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
 2018-02-17 16:56:31 -05:00
Anewbe 4c38647095 Further progress 2018-02-17 15:14:27 -06:00
Anewbe 38cb9bc406 More progress 2018-02-17 13:28:44 -06:00
Anewbe 5c9fd04ed3 Fixes some goofs 2018-02-17 01:19:57 -06:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Anewbe 1593e4fdeb Steals more modular armor code 2018-02-16 18:41:07 -06:00
LeshanaandAnewbe 45c8aa5b16 Small Fixes and Refactor (#4819) 
* Fix not calling parent in fake gloves.

* Refactor machinery.dm to use constants instead of bare numbers and strings.
 2018-02-15 19:11:04 -06:00
AnewbeandGitHub 76fa2f82bf Merge pull request #4810 from Mechoid/shapeshifterfix 
Shapeshifters can properly wear the clothing of other species.
 2018-02-13 10:41:58 -06:00
AnewbeandAtermonera 51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
AnewbeandAtermonera 534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
Mechoid 95112ed97c Shapeshifters can properly wear the clothing of other species. 2018-02-12 14:53:41 -08:00
AnewbeandAtermonera 6e215396d7 Removes the Explorer hood lights (#4787) 2018-02-11 18:54:17 -08:00
Woodratt 060e1aed18 Clothing adjustments and fix 
- Utility uniforms can now roll up sleeves
- SAR, Shaft Miner, Explorer can now select webbings in the loadout.
 2018-02-09 15:21:15 -08:00
Leshana a8c7c520bb VOREStation updates related to merged changes from polaris. 2018-02-07 20:08:10 -05:00
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
CyantimeandGitHub b31a108083 Reduces armor values on the vey-med voidsuit 2018-02-07 17:07:06 -05:00
NeertiandGitHub 2cb7aab49c Merge pull request #4733 from Anewbe/budget_insulated 
Budget Insulated Gloves tweaks
 2018-02-07 00:52:56 -05:00
Burrito-JusticeandAnewbe e813ce4666 Updates all medical sprites to Bluebay (#4712) 
* Updates all medical sprites to bluebay

* Forgot Odysseus w h o o p s

* heck forgot to change thing
 2018-02-06 23:11:09 -06:00
Anewbe 223de61bd4 Glove nerfs and tweaks 2018-02-06 00:45:43 -06:00
Anewbe 441bb3430e Corrects some small mistakes 2018-02-05 19:34:33 -06:00
Anewbe c30d1ca57b Tweaks the Explorer suit 2018-02-05 18:01:11 -06:00
Cameron653andGitHub e7d5402efb Update computer.dm 2018-02-03 14:18:25 -05:00