cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 9 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

6756 Commits

Author SHA1 Message Date
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
Heroman
b3ab8938f0 Fixes some shuttle chairs still having broken icons 2020-02-19 04:56:28 +10:00
Heroman
ed414bad57 Fixes broken optable light in surface medical 2020-02-18 18:16:22 +10:00
Heroman
a1eb556417 Adjustments to solars z-level's areas 2020-02-18 08:55:22 +10:00
Killian
77268ada27 Merge branch 'master' into kk-traffic 2020-02-16 07:00:56 +00:00
Killian
76f4ffe0de traffic! 2020-02-16 05:28:11 +00:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
97dad68bd2 Unmaps distro pressure regulators 2020-02-12 00:19:24 -05:00
Novacat
7933afeab7 Merge pull request #6511 from Heroman3003/superpod 
Limits the locations at which drone pod can drop
 2020-02-10 11:05:26 -05:00
Heroman3003
6a75d126b2 Merge branch 'master' into superpod 2020-02-10 23:08:57 +10:00
Heroman
5990e3341e Conflict resolution 2020-02-10 23:07:00 +10:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Heroman
695f34f5b9 Resolves conflicts 2020-02-10 22:44:45 +10:00
Spades
ddc544205d Merge pull request #6429 from Heroman3003/morphevent 
Adds Morph Spawn event
 2020-02-10 07:21:57 -05:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
RadiantFlash7
580726bac2 travis fix 
fixes traviiis
 2020-02-07 23:30:52 -05:00
RadiantFlash7
b5142f5077 RPD Changes 
Map fixes and changes!
Adds RPD to science,
Removes RPD from locker, leaves one on table in atmosia.
Removes APC for cryogaia compound. should be able to make new buildings/rooms now.
 2020-02-07 19:56:57 -05:00
Leshana
bd9df39879 Fix Runtime in areas.dm,307: Cannot read null.len 
area.ambience is never expected to be null.
 2020-02-04 16:33:21 -05:00
RadiantFlash7
11cd056737 Fixes CD's button placement 
Also fixes CD's office button opening every door on station >..>
 2020-02-01 13:22:28 -05:00
RadiantFlash7
246e4fd8dc Merge pull request #6 from Yawn-Wider/master 
Updating Repo
 2020-02-01 13:05:27 -05:00
RadiantFlash7
1e2f7b8847 Fixes security post airlock 
Fixes security post airlock. Hopefully.
 2020-02-01 13:02:40 -05:00
RadiantFlash7
88e446ad66 Misc map fixes 
Misc map fixes:
Sulphuric acid dispenser,
Disposals pipe fixing,
Wire fixes.
Button additions and fixes!
 2020-02-01 12:54:21 -05:00
Heroman
4fc576a19d Adds a single empty jetpack to belt mining office 2020-02-01 09:25:31 +10: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
Heroman
f2981ad53c Adds oxygen canister and a rack to belt mining office 2020-01-31 15:39:30 +10:00
Heroman
ce85d96088 Fixes wolfden and derilict errors 2020-01-30 09:59:25 +10:00
Heroman
0915cfd9e5 Resolves conflicts, updates description 2020-01-28 13:05:55 +10:00
Heroman
a733980a6e Merge branch 'master' of https://github.com/VOREStation/VOREStation into morphevent 2020-01-28 12:43:47 +10:00
Heroman
308ee2dc6a Limites the locations at which drone pod can drop 2020-01-28 10:20:59 +10:00
TheFurryFeline
c79c75e4c6 Bolt Dat Door Down 
So apparently I made an oversight with the bolt hatch controls..... Fixed now.

Changelog Notes:

- Changes buttons in the Reading Room cubicles to bolt their respective doors down, not open them.
 2020-01-27 12:38:24 -05:00
RadiantFlash7
8b1c121f85 Merge branch 'master' of https://github.com/RadiantFlash7/YWPolarisVore 2020-01-26 19:16:13 -05:00
RadiantFlash7
fa75858ffc Elevator is now a proper turbolift. 
Proper elevatoring.
 2020-01-26 19:16:06 -05:00
Repede
644b63ffc8 Merge branch 'master' into master 2020-01-26 19:05:20 -05:00
RadiantFlash7
5d9e5cbb58 Map Hotfix 2.3 
Adds a few more tables with stuff to medical equipment storage.
Makes tables in medical consistent with locations.
Fixes Atmos miss-area-labeling,
Gives the conveyor an area in lower medical.
Re-adds curtains to pscyhe lockup.
 2020-01-26 19:03:48 -05:00
RadiantFlash7
598365a1ff Hotfix2.2 
Re-adds medbay exit door switch, Changes walls around stairs entirely to windows (To hopefully fix bug with stairs being seen through walls)
Misc map fixes.
 2020-01-26 18:42:03 -05:00
Repede
795ebf969b Merge branch 'master' into mapnanoui 2020-01-26 18:02:24 -05:00
RadiantFlash7
726270f04c MapHotfix 2.0 
Fixes Wires that DON'T SEND POWER THE RIGHT WAY AAAAA
Also removes combatglove/boots with hard spawns.
Removes extra APC.
 2020-01-26 16:02:11 -05:00
RadiantFlash7
0e3cae380f Fixes tintable windows in surg preop 
Fixes electrochromatic windows in preop
 2020-01-26 03:25:22 -05:00
RadiantFlash7
9872f22b6c Map hotfix 
Fixes broken access reqs,
Reduces examroom+opensup medbay
Moves sleeper from diagnostics to ETC
Removes dining area, replaces with construction site.
shrinks open area in main level and adds chairs/vendors there.
 2020-01-26 03:10:59 -05:00
RadiantFlash7
439a60ee9f making travis happy 2 electricboogaloo 
Adds APC to psyche office. Whoops.
 2020-01-25 12:23:19 -05:00
RadiantFlash7
46f7b529ef Making Travis Happy 
Adds missing APC's and vent/scrubber
 2020-01-25 11:58:27 -05:00
RadiantFlash7
a0e5bc7a00 Travis fixes 
Fixes travis's bitching about missing APCs.
Whoops.
 2020-01-25 01:55:29 -05:00
RadiantFlash7
409d3a3426 Adds missing CD stuff 
Adds missing stamp and AR-B Glasses to CD office.
 2020-01-25 01:35:07 -05:00
RadiantFlash7
2931d08ffe Medbay Re-work, gunless vendors 
Moves Ballestics guns from vendors to equipment area in front of armoury (Still for officer's use.)
Reworks like. Most of medbay. (I pulled my hair out for you hawk. Love me ;-;)
Most important feature: Emotional support Corgi named Mister Wiggles.
 2020-01-25 01:23:16 -05:00
Schnayy
8ebe8c8772 Adds book cart to library 2020-01-23 23:53:25 -05:00
Repede
8cc9279ef3 nanoui fix maybe 2020-01-23 23:10:41 -05:00
Heroman
38bf0a33c6 Fixes and re-implements Rogue Mining (Belt Mining) 2020-01-23 18:43:20 +10:00
Heroman
57bd5bd574 Removes escape routes from the xenobio cells 2020-01-22 07:41:40 +10:00
Novacat
9d55376303 Merge pull request #6474 from Heroman3003/mapover 
A look over for floor decals and minor adjustments
 2020-01-21 01:46:30 -05:00
Heroman
80bb2bc539 Moves colormate, one more decal 2020-01-20 16:53:43 +10:00