cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,250 Commits 66 Branches 25 Tags
Upstream-Sync
Commit Graph
409 Commits
Author SHA1 Message Date
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
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -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
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
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
Anewbe 4c38647095 Further progress 2018-02-17 15:14:27 -06:00
Anewbe 38cb9bc406 More progress 2018-02-17 13:28:44 -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
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 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-01-19 17:52:25 -05:00
Arokha Sieyes 4432b2dd8b VS: Adds Destroy on shock collars (tsk tsk) 2018-01-18 18:19:16 -05:00
Arokha SieyesandLeshana ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
atermonera 7f43737a53 Locket desc was too long 2018-01-16 18:48:32 -08:00
Arokha Sieyes 10aabd98da POLARIS: 3000% human/update_icons() improvement 
Using overlays in lists and a mutable_appearance
 2018-01-15 21:39:47 -05:00
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid 5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Cyantime 9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
AnewbeandGitHub 3b89c5e320 Merge pull request #4384 from Belsima/maid 
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
 2017-12-12 19:51:35 -06:00
Anewbe ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
BelsimaandAnewbe 3bf74de3b1 Grammar time, again. (#4402) 
* Shriek grammar.

* Updates jumpsuit grammar.

* Update civilian.dm

* Update NewBan.dm

* Update gravitygenerator.dm

* Update Dreaming.dm

* Update shriek.dm

* Update NewBan.dm
 2017-12-05 14:34:45 -06:00
Belsima 0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Neerti 01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Neerti 8ac2100fa2 Adds Exploration Equipment 
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
 2017-11-24 07:22:35 -05:00
NeertiandGitHub cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether 
Adds bracelets!
 2017-11-21 01:32:35 -05:00
killer653 9f067a375b Fixes a few borked teshari cloaks 2017-11-19 00:09:45 -05:00
mistyLuminescence fc6ef8e921 Fixes hand sprites 2017-11-18 02:42:55 +00:00
mistyLuminescence 0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
killer653 11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Verkister 26ea6ec92d Enables the combo blend mode for most colorable loadout gear. 
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
 2017-11-02 15:33:52 +02:00
killer653 0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe 9135341847 Steals Bays modular armor, for later use 2017-10-19 23:32:33 -05:00
mistyLuminescenceandAnewbe e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Kholdstare34 becc2e4290 Adds heads of staff cloaks, adds them to the loadout. 2017-10-15 15:02:25 -05:00
BelsimaandAnewbe e61efc752a more gammers (#4052) 
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
 2017-10-13 23:32:22 -05:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
ElectricB1ueandAnewbe e67df48111 Changes the leg holster item sprite. (#3994) 
* Add files via upload

* Changes the item sprite
 2017-10-01 20:19:43 -05:00
Spades 07762f31e7 Some disorganizes changes by Aces 
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
 2017-09-21 03:22:20 -04:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
BelsimaandAnewbe fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
Spades a55d4c5e4c Imperial Military Update 
Adds Imperial stuff for our space elf romans.
 2017-09-02 04:07:25 -04:00