cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4f98fad36b1ee0fe35c84e9670f6da3d384149ea
CHOMPStation2/code/modules
History
Leshana 4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.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-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
..
admin
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
alarm
VS: Planes shenanigans. Begins 'plane' work, for VS specific things.
2018-01-14 00:40:00 -05:00
assembly
Adds Bonfires
2018-01-05 02:35:19 -05:00
awaymissions
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
blob
Works on New Blob
2017-11-29 22:35:01 -05:00
blob2
Fixes Blob Tasering
2018-01-17 14:19:40 -05:00
busy_space
…
client
Loadout capitalization fixes
2018-01-31 20:31:41 -05:00
clothing
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
customitems
Allows modkits to be created for any item. (#4450)
2018-01-19 18:11:28 -08:00
detectivework
Fix runtimes in MouseDrop when dragging out of the screen
2017-12-30 11:26:41 -05:00
economy
Food and Drink: Additions and Bugfixes (#4598)
2018-01-21 22:18:33 -08:00
entopics_vr
VS: AR Entopics and Soulcatcher projecting (+Worldbender)
2018-01-20 23:29:24 -05:00
error_handler
…
events
Make the Metor Strike random event be configurable per map.
2018-01-17 11:04:20 -05:00
examine
Fixes 'varient'
2018-01-08 16:42:20 -05:00
ext_scripts
…
flufftext
Grammar time, again. (#4402)
2017-12-05 14:34:45 -06:00
food
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
gamemaster
…
games
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
2017-12-26 23:07:58 -05:00
genetics
…
ghosttrap
…
holodeck
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
holomap
Replaced world.tick_usage with TICK_USAGE macro in VOREStation code
2018-01-04 22:57:00 -05:00
hydroponics
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
icon generation
…
integrated_electronics
Update reagents.dm
2018-01-07 06:05:33 -05:00
library
…
lighting
Make Darksight Great Again (#4626)
2018-01-25 18:01:33 -06:00
lore_codex
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
maps
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
materials
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
media
…
metric
…
mining
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
multiz
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
nano
…
nifsoft
Merge pull request #2819 from VOREStation/aro-niffix
2018-01-22 14:32:42 -05:00
organs
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
overmap
…
paperwork
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
planet
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
power
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
projectiles
More guns for the gun box
2018-01-18 18:53:43 -05:00
random_map
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
reagents
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
recycling
Mechs don't fit in disposal chutes
2017-12-31 17:17:23 -05:00
research
Merge pull request #2860 from VOREStation/polaris-sync-2018-01-27
2018-01-28 14:08:14 -05:00
resleeving
VS: Planes shenanigans. Begins 'plane' work, for VS specific things.
2018-01-14 00:40:00 -05:00
rogueminer_vr
…
scripting
SC Stupid Sized Map Update
2017-12-24 07:04:34 -08:00
security levels
Various and sundry admin messages
2018-01-06 19:15:54 -05:00
shieldgen
Adds Boats, Ports /TG/ Buckling (#4527)
2018-01-14 14:58:15 -06:00
shuttles
POLARIS: Fix two mistakes with the shuttle_arrival procs
2018-01-31 20:56:57 -05:00
spells
…
surgery
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
2018-01-22 12:10:19 -05:00
tables
Redesigns the armory
2018-01-08 01:00:41 -05:00
telesci
Polaris sync
2017-12-21 04:01:07 -05:00
tension
Adds Berserk
2018-01-11 01:35:14 -05:00
turbolift
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00
vehicles
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
ventcrawl
…
virus2
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
vore
Removed unnecessary 'src's, added missed cooldown
2018-01-31 20:20:43 -05:00
xenoarcheaology
STEALTH NERFSZZZZ - Removes rigs
2018-01-27 21:28:21 -05:00
xenobio
Allows easier prefilling of beakers, bottles, etc (#4583)
2018-01-19 15:38:46 -06:00
xenobio2
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
xgm
…