cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,658 Commits 5 Branches 0 Tags
a0555ef2d4f45a9c378038e3dcf68d1ca6701936
Commit Graph

39863 Commits

Author SHA1 Message Date
Darlantan
a0555ef2d4 Re-adds articles, fixes year yet again 2020-06-16 04:03:21 -04:00
Kassc Zeravla
bedcc16a3c DORMS ON STATION BABY! 
So I added dorms on the third floor, is honestly a bunch of stuff to make an entire new area work so... I guess I will do some bullet-points.

Second-Floor edit
-Added stairs next to the bar to access the civilian department.
-Fixed Airtight-flaps on Cargo that got carbons and mobs stuck behind them.

Third-Floor edit
-12 dorms
-Second floor bar, Dancing floor & arcade
-Botanical garden
-Dorms SMES
-FirstAid post
-A armadillo to protect your ERP's
-Everything else that allows every basic need to work properly and accordingly.
 2020-06-15 02:31:36 -04:00
Razgriz
1eae9b9bd1 Revert "Merge pull request #375 from Darlantanis/StarfireReportUpdate062" 
This reverts commit cd62907c51.
 2020-06-14 23:04:23 -04:00
Darlantan
b440e687b9 Fixes station year 2020-06-14 03:27:41 -04:00
CHOMPStation2
b6e1e20deb Update starcaster_ch.dm 
Added a blank line just to diffbots
 2020-06-08 12:14:12 -07:00
Darlantan
82ba96f3ff Changes year back to 2564 
Unfortunately I haven't figured out why this wouldn't change the year under the status tab when testing.
 2020-06-08 07:29:31 -04:00
Darlantan
5e776cdc0b Adds Starcaster 
-Adds the starcaster, a device for reading the news.
-Adds starcaster as a free loadout item
-Comments out sleepy sergal articles, adds starfire articles
 2020-06-08 07:28:15 -04:00
Razgriz
fe1c5f96e7 Comment out the ice pick for now 
It's a map specific item for YW and causes some compilation issues. It's ok, we don't need it tho.
 2020-05-30 12:55:29 -07:00
Razgriz
0a2d4840e9 Fix stylesheet again 
WHY DOES IT KEEP CHANGING
 2020-05-25 13:45:30 -07:00
Razgriz
382a9c4ab6 Silence the beep 2020-05-24 23:27:35 -07:00
Razgriz
c8693a79a4 Revert Preamble 
Because the newscaster beeps at you, then the preamble, then the station. STOP. IT'S ENOUGH.
 2020-05-24 23:19:25 -07:00
Razgriz
92bf3ed42b Update shuttle_emergency.dm 2020-05-21 21:09:30 -07:00
Razgriz
2dd9fbc473 Update announce.dm 2020-05-21 20:44:22 -07:00
Razgriz
95612b919b Update outfit_vr.dm 2020-05-21 20:41:04 -07:00
Razgriz
da675ee4e9 Update emergency_shuttle_controller.dm 2020-05-21 20:35:12 -07:00
CHOMPStation2
198e464f3c Update catalogue_data.dm 2020-05-21 05:14:16 -07:00
Razgriz
f661c13c89 Update banners.dm 2020-05-21 04:47:28 -07:00
Razgriz
39ba3999b5 Update catalogue_data.dm 2020-05-21 04:25:14 -07:00
Razgriz
e89ed91ce3 Update banners.dm 2020-05-21 04:19:37 -07:00
Razgriz
6c591400e1 Update adminhelp_vr.dm 2020-05-21 04:16:05 -07:00
Razgriz
e4c54a5e4c Update living_ch.dm 2020-05-21 04:10:53 -07:00
Razgriz
1c6fb9de58 Update casino_ch.dm 2020-05-21 04:07:36 -07:00
Razgriz
e4dc160cef Update examine.dm 2020-05-21 03:45:47 -07:00
Razgriz
fb98ba3471 Update mine_turfs.dm 2020-05-21 03:42:03 -07:00
Razgriz
b99e19a978 Update gauntlets.dm 2020-05-21 03:41:03 -07:00
Razgriz
5bf0c28a38 Update arm_guards.dm 2020-05-21 03:40:34 -07:00
Razgriz
3e58d2490a Update human.dm 2020-05-21 03:39:07 -07:00
Razgriz
63dc711254 Update ai.dm 2020-05-21 03:37:23 -07:00
Razgriz
81a6233829 Update ai.dm 2020-05-21 03:35:56 -07: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
7fc7803e53 Update autotransfer.dm 2020-05-20 23:45:55 +02:00
izac112
8e9b61f7e1 Updates encryptionkey_vr.dm to be in line with our chain of command. 2020-05-20 14:43:30 +02:00
Killian
e248914a3a Merge branch 'master' into kk-mapfixes 2020-05-19 10:45:35 +01:00
Killian
7e64aa3f1b mapfix IIIa 2020-05-19 10:04:40 +01:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
3cf33431f1 Merge pull request #7953 from VOREStation/Arokha/whisubtlev 
Change name of Whisubtle vis verb
 2020-05-18 15:26:45 -04:00
Aronai Sieyes
8bf7178d61 Just remove on_loc_moved entirely 2020-05-18 15:13:20 -04:00
Aronai Sieyes
ea02fe8c75 Change name of Whisubtle vis verb 2020-05-18 14:23:33 -04:00
Izac Joof Forsgren
42e5d11fb4 Merge branch 'master' into izac-voreupdate 2020-05-18 20:14:49 +02:00
Aronai Sieyes
ff1c571091 Merge pull request #7944 from dwinters99/emotes 
added new emotes, edited awoo
 2020-05-18 14:04:56 -04:00
Aronai Sieyes
fe9683b53b Merge pull request #7950 from VOREStation/Arokha/fixmysteryleather 
Fix mystery steel-leather
 2020-05-18 13:59:42 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
Aronai Sieyes
0adea12715 Optimize mob finding in radio ranges 2020-05-18 11:17:39 -04:00
Aronai Sieyes
2fca303998 Convert unzooming into listener 2020-05-18 10:47:13 -04:00
Aronai Sieyes
3f4fd59bd0 VS: Fix weird leather thing 2020-05-18 10:28:27 -04:00
Aronai Sieyes
0b858a36c8 These can't be material stacks if they don't have a material 2020-05-18 10:28:18 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
7612c7a149 Merge upstream PR 2020-05-18 09:31:51 -04:00
Aronai Sieyes
6bf0112339 Port Bay's Catwalks 2020-05-17 23:57:21 -04:00