cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,477 Commits 10 Branches 0 Tags
a697e83ebd8509b193a9a4721ed253888c0c5e6b
Commit Graph

428 Commits

Author SHA1 Message Date
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
Leshana
fb532ac920 Refactor Character Setup to use MAP 
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
 2020-05-21 19:04:56 -04:00
Aronai Sieyes
ba46116ce7 Merge pull request #7762 from VOREStation/upstream-merge-7107 
[MIRROR] Prevent holopad chat from going to lobby
 2020-05-10 22:10:54 -04:00
Atermonera
fc8f1951f1 Merge pull request #7107 from VOREStation/pol-holohear 
Prevent holopad chat from going to lobby
 2020-05-10 18:41:00 -04:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Aronai Sieyes
92c3cf7345 Merge pull request #7706 from VOREStation/aro-holohear 
Prevent holopad chat from going to lobby
 2020-05-08 14:43:22 -04:00
Aronai Sieyes
dd3d4f4cfe Refactor spawn_checks_vr and when it is called 2020-05-08 13:34:31 -04:00
Aronai Sieyes
67c8945a66 Prevent holopad chat from going to lobby 2020-05-07 21:34:21 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Aronai Sieyes
311c4e35df Clean up last_area garbo 2020-04-30 15:42:55 -04:00
Aronai Sieyes
c2ca984d18 Merge VS changes for telecomms 2020-04-29 10:24:37 -04:00
Atermonera
eb6eb7bcd6 Refactor telecomms and consoles to operate on logical zlevels 2020-04-28 17:56:35 -04:00
Atermonera
7f6b583b24 Merge pull request #7025 from atlantiscze/2020_04_21_Cleanup 
Removes stray unused variable that triggered a compile warning
 2020-04-25 16:36:34 -04:00
ShadowLarkens
1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Leshana
13d7408058 Fix null values being present in mob_list. 2020-04-14 17:03:42 -04:00
Aronai Sieyes
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Aronai Sieyes
f8d920fd02 Allow 'offmap spawn' jobs to be isolated from station employees 2020-04-11 12:03:10 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Leshana
a96caa5f70 Update Lobby stat panel to show voting and server init status. 2020-04-10 11:41:38 -04:00
Atermonera
2af53022fe Merge pull request #6770 from Mechoid/ReadyUpNotice 
High-priority Job Display
 2020-03-03 01:37:00 -05:00
Novacat
48e022ed1b Update new_player.dm 2020-02-24 20:30:09 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Novacat
2d8376a2fa Update new_player.dm 2019-09-10 02:20:48 -04:00
Unknown
c8d445d4d9 Miscellaneous Fixes 
- Reverts #4785. It never functioned in its intended purpose, and mostly just seemed to affect people who had the same names.
 2019-09-10 02:19:06 -04:00
Rykka_Stormheart
116f532169 Several mice tweaks, mainly: 
Uncommented out the mice pull_size and mob_pull - this fixes mice pulling lockers and shit.
Reduced mouse spawn time by half, since mice are nerfed now to not be able to pull large shit. (As they shouldn't be able to.)
Merged/incorporated file from https://github.com/VOREStation/VOREStation/pull/5709 - his was simple_animal, I moved it to simple_mob. All credits for changes in mouse_vr.dm go to them.

Small Fixes:
Added a little extra comment to the mice examine text. <3
Fixed the "Observe" Spawn timer - it originally said 5 minutes, fixed it to show the "actual" respawn time - 60 seconds.
 2019-08-25 00:15:33 -06:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Novacat
f62c6f2194 Merge pull request #4785 from VOREStation/upstream-merge-5962 
[MIRROR] Prevents people from joining with the same character
 2019-03-28 21:07:32 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Unknown
9a5065a77f Forgot Vorestation Edit 2019-02-25 09:23:17 -05:00
Unknown
d9ad515056 [5962] Adjustments to PR 4785 
- QTR no longer blacklists the character from rejoining.
- Modified notifications to encourage QTR use
 2019-02-25 09:13:32 -05:00
Anewbe
ceb2c7112e Merge pull request #5962 from GeneriedJenelle/patch-1 
Prevents people from joining with the same character
 2019-02-18 15:13:15 -05:00
Kates
06f01d9e58 Update new_player.dm 2018-10-06 03:27:58 +02:00
lbnesquik
fdd5d10b54 Fix misleading alert. 2018-10-03 18:36:39 +02:00
Verkister
74d0bd8763 Couple clown tweaks. 
-Allows our responsible whitelist clowns spawn with the bikehorn.
-Disables the destructive forced name randomization and lossy rename BS on join.
 2018-07-25 10:54:59 +03:00
Anewbe
d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Anewbe
25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 21:33:31 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Anewbe
9e4a625f18 Hides jobs with the Never pref on late join 2018-04-25 20:28:42 -05:00
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
c4a6f8bae7 POLARIS: Fixes #3298 (VS) - Observer-ghosts were naked instead of dressed 2018-03-25 17:01:05 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
Arokha Sieyes
96695588f4 POLARIS: Fixes #3298 (VS) - Observer-ghosts were naked instead of dressed 2018-03-20 14:47:05 -04:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00