cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c5ded806f10c5db95ca2d212fb63a91579a642bc
CHOMPStation2/code/modules
History
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
2018-05-27 19:26:12 -04:00
..
admin
Merge pull request #3762 from VOREStation/aro-sync-05-25-2018
2018-05-27 18:38:44 -04:00
alarm
…
assembly
for(var/bad_code in world)
2018-04-29 17:55:04 -04:00
awaymissions
Map changes for explorers
2018-05-09 11:36:26 -05:00
blob
…
blob2
…
busy_space
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
busy_space_vr
…
client
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
clothing
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
customitems
…
detectivework
…
economy
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
entopics_vr
…
error_handler
…
events
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
examine
…
ext_scripts
…
flufftext
…
food
…
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
…
holomap
VS: The VS excludes for SSAO
2018-05-14 11:54:10 -04:00
hydroponics
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
icon generation
…
integrated_electronics
Fixes IC button label reference in chat messages
2018-05-06 01:40:30 -04:00
library
…
lighting
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
lore_codex
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
maps
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
materials
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
media
…
metric
…
mining
Set a fake ID on shelter buttons to avoid messing with every door
2018-05-18 10:14:27 -04:00
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
multiz
…
nano
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
nifsoft
Fix promthean NIF shoving
2018-05-23 22:47:29 -04:00
organs
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
overmap
…
paperwork
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
persistence
…
planet
Revert "Upgrades Planetary Weather to vis_contents (#5170)"
2018-05-15 00:57:55 -04:00
power
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
projectiles
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
random_map
…
reagents
SYNC: Alter promethean changes
2018-05-25 15:05:39 -04:00
recycling
for(var/bad_code in world)
2018-04-29 17:55:04 -04:00
research
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
resleeving
removed SC self backup and added a null
2018-05-15 11:52:38 +03:00
rogueminer_vr
…
scripting
…
security levels
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
shieldgen
Power cost decrease on Lights and Shield Diffusers
2018-04-29 20:11:20 -07:00
shuttles
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
spells
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
2018-05-25 13:23:47 -04:00
surgery
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
tables
…
telesci
Mostly comment out advanced GPSes
2018-05-17 15:38:07 -04:00
tension
…
tooltip
…
turbolift
…
vehicles
…
ventcrawl
…
virus2
…
vore
Merge pull request #3737 from Verkister/patch-25
2018-05-24 17:36:59 -04:00
xenoarcheaology
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
2018-05-27 19:26:12 -04:00
xenobio
…
xenobio2
…
xgm
…