cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 08:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,796 Commits 9 Branches 0 Tags
61baa91b227f73668ecbbfc002daaddb55167204
Commit Graph

321 Commits

Author SHA1 Message Date
Verkister
fb1b3d210e Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-19 10:36:41 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
d8c7593395 Merge pull request #7725 from Little-119/shiny-clothing 
Add Romantical Whale's "Shiny Clothing"
 2020-09-05 12:37:15 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
f0bfa69416 Merge pull request #7558 from Cyantime/lanternlight 
Returns the jackolantern overlay
 2020-08-27 19:58:53 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Little-119
bcb07cfeef Add Romantical Whale's "shiny" clothes 2020-08-27 18:08:36 -04:00
Rykka
6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits 
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
 2020-08-26 21:58:30 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
listerla
c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
Razgriz
5fe45fc4d6 Merge pull request #422 from Shadowfire117/goiaanddrinks 
Casino updoot!
 2020-07-23 13:34:00 -07:00
Shadowfire
7fc2c5e092 Casino updoot 
New features:

New category of prizes; Pets! Anything from a tame chicken or goose all the way up to absolute unit Oties and Zorgoias!
New custom looking spawner grenades for casino mobs, dont flash and blind people, perfect for a party trick!
New casino security id card!
Zorgoias have a chance to show up in predator crate!
Two gorgeous new crowns, the crowns of the king goose and the queen goose, sprited by our lovely artist Kassc!

bug fixes and edits:
Renamed Jack's brew to Rush hour... What was I thinking calling it that?
fixed casino prize dispenser flashing 'price' instead of 'prize'
Fiddled with slot machine, hopefully not everyone will constantly get the platinum chip, might need more adjustments
Fixed wrong access requirements in casino bar
Put access restrictions on the windoors to the prize booth
sunglasses in casino recroom
Fixed casino wallets, now they can hold what normal can hold AND card decks, casino chips, casino manual and platinum chip!
Put a resleeving pod in the casino medbay, for easier resleeving during events!
Reworked access restrictions to casino security area, casino security uses 201 as their access number
 2020-07-23 14:57:13 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Unknown
dacacf8bc8 Localization updates 2020-05-28 14:06:21 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Unknown
e76e1e3641 Some renaming oversights 2020-05-10 14:47:08 -04:00
Unknown
a74d890331 Repurposes Explorer Corp Uniforms 
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
 2020-05-10 14:44:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Aronai Sieyes
209eb0e017 Port some random clothes 2020-04-18 19:41:54 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Unknown
6d7cb1cf7a Adds Mechanicus Techpriest Robes 
https://www.youtube.com/watch?v=ztzq05IzYds

Adminbus Only.
 2020-04-02 19:44:21 -04:00
Cerebulon
ef5f66184d Sound port sprite fixes (#6869) 2020-03-19 00:14:23 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
Nadyr
8fd3b260da Merge pull request #218 from Shadowfire117/Casinoport 
Casino port!
 2020-02-17 22:59:14 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Shadowfire
57464baadc port 0.9.9.9 
just uploading so others can see work, still not ready for commitment
 2020-02-08 01:11:36 +01:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Novacat
110d37a4e5 Update misc_special.dm 2020-01-21 01:11:02 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
 2019-11-29 19:13:53 -05:00
Repede
7035e30fc3 Fixed blizzard so animals do not get killed 
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
 2019-11-24 16:57:06 -05:00
Cerebulon
6385a2f662 ERT Rangers Costumes (#6493) 
* Sprites

* and code fuckit
 2019-10-25 15:07:49 -04:00
RadiantFlash7
74a8ff3d71 Map changes, Explorer uniforms and hoodies 
Fixes power line issues, replaces all unsimulated turfs, adjusts snowtiles to be simulated tiles, Fixes elevator issues.
 2019-10-18 17:28:26 -04:00
Novacat
2ae04b4264 Fixes typo in flexitac melee protection (#6470) 2019-10-05 21:12:21 -04:00