cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
80,514 Commits 10 Branches 0 Tags
tracy
Commit Graph
1963 Commits
Author SHA1 Message Date
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
RazgrizandGitHub 1a75422858 New uniform and fixes star trek uniforms 
Adds a green-colored flight suit with security uniform armor values for security.
Separates star trek engineering uniforms and security uniforms.
 2020-02-12 03:31:35 -07:00
Killian 7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
AtermoneraandVirgoBot 1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Shadow ca7fd68c99 Fluffi Item 2020-02-02 15:16:31 -06:00
Darlantan 1ff6996898 Reimplements hooded tesh cloaks 
Re-adds hooded teshari cloaks, also re-adds the retrowave and glowing teshari cloaks. Renames "teshari_hood.dmi" to "teshari_hood_ch.dmi" because this file doesn't exist upstream.
 2020-01-31 22:11:25 -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
RepedeandGitHub 6f3ea86aaa Merge branch 'master' into ringtones 2020-01-23 18:48:20 -05:00
Cebutris 9bde77ed63 ringtone >> ttone 2020-01-23 18:44:00 -05:00
Cebutris 546de503d0 remove kh 2020-01-22 03:03:34 -05:00
Cebutris 70fa53cb2c beep 2020-01-22 02:59:41 -05:00
Cebutris 3450336020 does the thing, and another thing 2020-01-20 13:44:02 -05:00
VerkisterandVirgoBot fa0a6d88a8 Fixes loadout index runtime spam (#6626) 
sanity checks saving the day once more.
 2020-01-16 02:56:04 -05:00
AtermoneraandVirgoBot 28a1d8669c Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck 
Psychiatrists can now properly get the medical turtleneck via loadout
 2020-01-15 23:09:19 -05:00
Cebutris 0773e06bc6 oops 2020-01-13 19:51:31 -05:00
Razgriz de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk_v3 20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
KatesandGitHub 930215e3d7 Update loadout_suit_vr.dm 2020-01-11 17:07:29 +01:00
lbnesquik a92437ce23 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Taur-clothes-fix 2020-01-11 07:49:03 +01:00
lbnesquik af97208347 Poncho is now in the loadout as well, with a little pointer to notify people. 
Poncho is also compatible with drake taur,  wolf get janitaurial jumpsuit for the future.
 2020-01-11 07:48:36 +01:00
Heroman a570cafa2a Adds taur cloak and dress to loadout 2020-01-11 11:33:58 +10:00
Sharkmare e4f544eb32 Trying to fix FLUFF 2020-01-11 01:20:11 +01:00
SharkmareandGitHub 6f94d6e05e Removes YW/VS Fluff (#110) 
* Removes YW/VS Fluff
 2020-01-10 21:43:43 +01:00
RadiantFlash7 e26b48d335 Map fixes. 
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
 2020-01-05 01:09:08 -05:00
RazgrizandGitHub e8069cd7cd Whitelist fix 2019-12-30 02:36:29 -07:00
Hawk_v3 a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Repede 5c33de39c1 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore 
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	icons/mob/robots.dmi
 2019-12-28 12:00:22 -05:00
Repede 38d5113a9b Finished, fixing maps and shuttles, fluff access. 2019-12-27 15:51:53 -05:00
AtermoneraandVirgoBot b6a81efb9a Merge pull request #6582 from Shadow-Quill/Material-Scanner-Access 
QM can now get optical meson scanners
 2019-12-22 01:59:32 -05:00
RepedeandGitHub b41698c720 Merge branch 'master' into master 2019-12-21 21:35:09 -05:00
Hawk_v3 6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7 af25a14c06 Map fixes 
Map fixes and fixing my fluff item's sprite. It failed a merge forever back.
 2019-12-21 00:10:44 -05:00
SchnayyandVirgoBot 29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
NovacatandGitHub 0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Meghan-Rossi 604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
VerkisterandGitHub 0c074e501a Fixes loadout webbings/pouches for explorers 
Fixes loadout webbing vests and drop pouches lacking explorer access despite clearly stating its presence on the display name.
 2019-12-19 15:41:03 +02:00
AtermoneraandVirgoBot 3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
TheFurryFelineandGitHub 4fd6dc9868 Fluff Item Fixy 
Fixes #5992
 2019-12-10 09:41:00 -05:00
Repede 3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Hawk_v3 5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Repede f9688aea70 Edgyness increase 2019-12-08 01:12:17 -05:00
Repede 461fcfd160 Fixing medal fluff 2019-12-06 16:10:35 -05:00
Keila-coon b0abdc4491 Merge branch 'master' of https://github.com/Keila-coon/YWPolarisVore 2019-12-01 02:38:56 -04:30
Keila-coon e10c7d4482 Fluff item request updated 
-Deleted the place holder for the modkit
 2019-12-01 02:38:52 -04:30
NovacatandGitHub cbb5a4bdd4 Merge pull request #6246 from TheFurryFeline/patch-9 
Expired Permit Removal
 2019-11-29 22:23:40 -05:00
NovacatandGitHub defff15e24 Update loadout_fluffitems_vr.dm 2019-11-29 20:56:27 -05:00
AnewbeandVirgoBot 1de75f06bf Merge pull request #6548 from Meghan-Rossi/paifix 
Fix pAI preferences not loading
 2019-11-29 19:49:03 -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
Keila-coonandGitHub 698d5d564d Merge branch 'master' into master 2019-11-29 13:07:46 -04:00
Keila-coon ac7ffd08b8 Update loadout_fluffitems_yw.dm 2019-11-29 12:28:46 -04:30