cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,630 Commits 7 Branches 0 Tags
e9abd9894de9122d4b16b3ea8c70a96370138d84
Commit Graph

574 Commits

Author SHA1 Message Date
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
LunarFleet
b5a8a6944c Fax machine comments 
(Feed me paper)
 2020-07-27 18:26:35 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
LunarFleet
5daabf8c0c Unity Hound Parts 2020-07-22 23:10:51 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Izac Joof Forsgren
d76589b9e9 Revert "Revert "Fixes some events, removes unused scripts related to TGS3, etc"" 2020-07-09 18:00:20 +02:00
Izac Joof Forsgren
3cb9892fbc Revert "Fixes some events, removes unused scripts related to TGS3, etc" 2020-07-09 14:54:48 +02:00
Repede
1845eed3cc Fixes some events, removes unused scripts related to TGS3, etc 2020-07-07 20:04:03 -04:00
izac112
69d16539a1 Fixed the fax machin on local testing server 2020-05-24 14:13:22 +02:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Atermonera
d14a15ec6f Merge pull request #7144 from Cyantime/patch-1 
Allows fax machine toner replacement
 2020-05-15 21:06:50 -04:00
Rykka
e29648e47c Add some placeholders so they can at least get furry/scaley butts. 2020-05-13 06:28:00 -04:00
Rykka
fd656e06dd Tweaks to Photocopier, Adjust NanoUI, and allow Butt Photocopying! 
You can photocopy your ass!

It will use 10 toner per (original) photo, and will use your base species!

If you're a custom species and have icon set to Vulpkanin, for instance, it will use the vulp ass. Werewolves will use the vulp for now, pending a thicc'er sprite.

Xenos + Xenohybrid will use THICC XENOS ASS sprites.

Xenochimera will work the same as custom species, using the base species ass.

The rest of the species not currently implemented (that is, those without sprites) will print a generic human butt. If you'd like custom sprites, sprite an ass, and put it in butts_vr.dmi

Improvements to photocopiers will be pushed forward to Polaris.

You can also tell precisely who's ass it is on the photo by clicking on it. 
![https://i.imgur.com/UOPhfIt.gifv](https://i.imgur.com/UOPhfIt.gifv)

I'd still like to add the option to recolor the sprite based on your body color, but for now, it's a black/white ass. Sorry!
 2020-05-13 06:20:44 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Razgriz
d075ca533c Update folders.dm 2020-05-09 21:17:07 -07:00
Razgriz
5148a5f4b8 Update folders.dm 2020-05-07 16:45:13 -07:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -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
Aronai Sieyes
8216144ab9 Add cooldown to pen clicks 
Fixes https://github.com/VOREStation/VOREStation/issues/7000
 2020-05-04 23:06:38 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
SplinterGP
e81ac515b7 Reverts stamps and folder to use old sprite 2020-04-17 19:16:46 -03:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Aronai Sieyes
de621558c3 Update adminpaper.dm 2020-04-14 17:07:21 -04:00
Aronai Sieyes
a1dcd049b8 Adds a fax machine to the ITV Talon 
Also adds 'trader' reply fax choice
 2020-04-14 16:40:21 -04:00
Unknown
9f9e0b329d Reverts old vorestation edits 2020-04-05 22:26:34 -04:00
listerla
335442fd09 BUREAUCRACY TIME (#6851) 
* BUREAUCRACY TIME

* Missing white folder

* Sounds are already in. Oops.

* Removes clone of paper_taped

* branch update, hopefully

* pen-x states

* Restores paper bins

* Revert "Restores paper bins"

This reverts commit 2dd29478a4a069e8866f467a0a6359e468b50434.

* Reverts bins for real?
 2020-04-05 22:16:28 -04: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
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Novacat
194c9f7a63 Merge pull request #6841 from VOREStation/upstream-merge-6818 
[MIRROR] Fully Implements R_EVENT for Event Managers
 2020-03-15 17:01:36 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Aronai Sieyes
403dba2f60 Allow procs to spawn filled paper with passing info to constructor 2020-03-11 22:51:58 -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
Novacat
554ddbb7ff Merge pull request #6625 from VOREStation/aro-beuro 
New folders/pen/clipboard sprites
 2020-03-01 10:51:59 -05:00
Atermonera
cc487ceebf Merge pull request #6737 from listerla/penclick 
Makes pen click when you click on them
 2020-02-24 16:20:09 -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
25f31306db New folders/pen/clipboard sprites 
From CEV-Eris (or maybe Bay?)
 2020-02-20 21:24:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05: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
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00