cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,949 Commits 8 Branches 0 Tags
48af4c881c9384e908ab7f972ad99f05ff2ffe3f
Commit Graph

1027 Commits

Author SHA1 Message Date
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
ontejbjoav
82cc9df4d3 Adds ontejbjoav to alienwhitelist.txt 
Updated whitelist after my Diona app was accepted

https://forum.vore-station.net/viewtopic.php?f=46&t=1803
 2020-08-17 14:10:26 +01:00
izac112
74d84d2cff Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-17 09:44:00 +02:00
Novacat
a70b2a53f8 Merge pull request #8421 from LunarFleet/Lun-Sprite 
Adds Lunar Fleet and Jademanique to whitelists
 2020-08-17 01:43:03 -04:00
Draycu
c39149f4d1 Update alienwhitelist.txt 
Making a quick whitelist change request after being approved to play as a vox~!

https://forum.vore-station.net/viewtopic.php?f=46&t=1793
 2020-08-17 00:24:25 -05:00
Novacat
2ca8206f56 Merge branch 'master' into Lun-Sprite 2020-08-17 01:19:47 -04:00
C.L
df08b9b08e Adds Pearl Prophet to the Alien Whitelist for Protean 
See: https://forum.vore-station.net/viewtopic.php?f=46&t=1795&sid=30eb3127d88231d79f429d269a696814
 2020-08-16 20:25:25 -04:00
Novacat
9ab92001e6 Merge pull request #8709 from Tenryumi/ryumi-protean-whitelist 
Adds myself to the Protean whitelist
 2020-08-16 17:58:59 -04:00
Amy
0916ea07c1 adds myself to the Protean whitelist 2020-08-16 11:23:54 -05:00
Rykka
ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00
Victor Zisthus
a1d62f34fb Resuming where I left off 
More door updating.

(99,79,1) Made this place look a little less empty.
(96,83,3) Tide Bait.
(94,41,8) WHO PUT A CHAIR IN THE ENGINES? Removed.
(32,68,8) Added fluff text

Added R-walling to Mining processing and Mining shuttle at Level 8
 2020-08-15 20:25:03 -04:00
Victor Zisthus
69ac92250a Access Overhaul + Minor Map Tweaks 
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
 2020-08-15 18:26:43 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
MrSign
1aa486d29a Update alienwhitelist.txt 2020-08-01 10:17:38 +10:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
MrSign
b54389f647 Update alienwhitelist.txt 2020-07-18 07:22:33 +10:00
MrSign
ee0ddab8fa Update alienwhitelist.txt 2020-07-17 22:41:20 +10:00
LunarFleet
61413eedae Whitelist and sprites finished 2020-07-16 21:14:31 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Voidalynx
e2ddda44dc Update alienwhitelist.txt 2020-07-12 03:21:50 +01:00
CRTXBacon
7c1ba1b278 Update alienwhitelist.txt 2020-06-27 17:45:41 +01:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
H0lySquirr3l
de6b5f8623 Update alienwhitelist.txt 2020-05-28 14:58:07 -05:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
86373ecc96 Merge pull request #8050 from VOREStation/Arokha/furtherghost 
Redo respawning
 2020-05-25 11:37:51 -04:00
Aronai Sieyes
e4bedde385 Merge pull request #8074 from VOREStation/Cameron653-phoenixx0-whitelist 
Adds Phoenixx0 to whitelist for Vox
 2020-05-25 11:32:46 -04:00
Aronai Sieyes
62e45300e1 Merge pull request #8056 from Tastypred/patch-1 
Update Alienwhitelist.txt
 2020-05-25 11:31:45 -04:00
C.L
13fff9c59b Adds Phoenixx0 to whitelist for Vox 
Approved application here: https://forum.vore-station.net/viewtopic.php?f=45&t=1747
 2020-05-25 03:29:03 -04:00
Voidalynx
4e1e24bad8 Update alienwhitelist.txt 2020-05-24 16:46:27 +01:00
Tastypred
4fcf5395dd Update Alienwhitelist.txt 
My last pull didn't seem to work so I tried a different method to add myself under protean.
 2020-05-24 01:15:56 -04:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
knoxon1
ff515838a4 Update alienwhitelist.txt 2020-05-22 21:28:09 -05:00
Aronai Sieyes
62c3bdd2e7 Merge upstream PR 2020-05-21 15:43:40 -04:00
Atermonera
0c200c9483 Allows you to toggle off Byond/Discord/URLs in OOC 2020-05-21 14:20:05 -04:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Novacat
1adbc31496 Update config/alienwhitelist.txt 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2020-05-13 12:31:11 -04:00
radar651
8f47d32d4e Alien whitelist update 
updates the alien whitelist
 2020-05-13 12:01:06 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -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
aa6d22097b Port SSnightshift from Paradise 
Makes the station have a night mode.
 2020-05-03 17:51:05 -04:00
Unknown
43f4fb49ad Miscellaneous Changes 
- Adds some more uplink stuff based on recent updates
- Purges Xenomorph hybrid whitelist (they are not whitelisted anymore)
- Adds some hybrid cells to the Dropship
 2020-05-03 10:32:46 -04:00
MrSign
12420f8de0 Update alienwhitelist.txt 2020-04-26 10:02:26 +10:00
Novacat
7e321fd1ef Update alienwhitelist.txt 2020-04-20 19:52:45 -04:00
Tastypred
2468b5b3a0 Add files via upload 
Added tastypred to whitelist for Shadekin Empathy, see: https://forum.vore-station.net/viewtopic.php?f=45&t=1734
 2020-04-20 19:25:15 -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
ShadowLarkens
c44553c9d5 Added three utilities for admins & developers 
- There is a new option in the player panel labeled "Send back to
   Lobby", which will send a given player back to the lobby.
 - The player panel also has a shortcut to the "Spawn Character" verb.
 - Finally, there's a new config option that disables the warning
   message about multikeying if two mobs with the same CID are found;
   this option should NOT be enabled if multikeying is prohibited by the
   server rules. It is simply a developer tool, as multikeying is
   sometimes necessary to test new features that require two clients
   interacting.
 2020-03-27 15:41:44 -07:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Novacat
893ed0572d Merge pull request #6779 from VOREStation/aro-pregameconf 
Makes pregame time a config setting
 2020-03-08 01:48:04 -05:00