cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4c2fd72c5fcf966d0de50fc3bd85c27970ecb82d
CHOMPStation2/code/modules
History
Anewbe a030390c4e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into drone_circuits 
# Conflicts:
#	code/modules/mob/living/carbon/brain/MMI.dm
2017-09-28 15:38:19 -05:00
..
admin
Adds give-modifier to the debug verb list
2017-09-27 01:16:04 -05:00
alarm
…
assembly
…
awaymissions
More merging updates
2017-09-19 23:58:40 -04:00
blob
…
busy_space
More merging updates
2017-09-19 23:58:40 -04:00
client
More merging updates
2017-09-19 23:58:40 -04:00
clothing
Tweaks the Chameleon Gun's tech levels
2017-09-27 12:25:36 -05:00
customitems
…
detectivework
…
economy
More merging updates
2017-09-19 23:58:40 -04:00
error_handler
…
events
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
examine
Corrects pipe examine info.
2017-09-25 00:57:16 -04:00
ext_scripts
…
flufftext
Adds a bunch of dreams. (#3888)
2017-09-20 13:51:14 -05:00
food
More merging updates
2017-09-19 23:58:40 -04:00
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
…
hydroponics
Adds Farm PoI
2017-09-26 01:44:06 -04:00
icon generation
…
integrated_electronics
Shifts around a few Tech Levels.
2017-09-23 12:54:04 -05:00
library
…
lighting
Fixes the Sun/Weather and Ports Vore's Lighting SS
2017-09-22 12:16:21 -04:00
lore_codex
…
maps
Adds Farm PoI
2017-09-26 01:44:06 -04:00
materials
Adds grave markers
2017-09-26 21:03:34 -05:00
metric
…
mining
…
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into drone_circuits
2017-09-28 15:38:19 -05:00
multiz
More merging updates
2017-09-19 23:58:40 -04:00
nano
…
organs
Merge pull request #3918 from Anewbe/liver_alcohol
2017-09-26 07:01:15 -04:00
overmap
…
paperwork
More merging updates
2017-09-19 23:58:40 -04:00
planet
Fixes the Gravity Failure Event
2017-09-24 14:03:43 -05:00
power
Merge pull request #3933 from Anewbe/batteries
2017-09-25 21:32:41 -04:00
projectiles
Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon
2017-09-26 01:09:46 -05:00
random_map
…
reagents
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix
2017-09-26 17:30:30 -04:00
recycling
More merging updates
2017-09-19 23:58:40 -04:00
research
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer
2017-09-25 20:35:19 -05:00
scripting
…
security levels
More merging updates
2017-09-19 23:58:40 -04:00
shieldgen
Hull shields and emergency shields check for outdoor turfs and drops
2017-09-22 23:56:38 +01:00
shuttles
…
spells
…
surgery
Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix
2017-09-27 19:46:29 -05:00
tables
More merging updates
2017-09-19 23:58:40 -04:00
turbolift
…
vehicles
…
ventcrawl
More merging updates
2017-09-19 23:58:40 -04:00
virus2
…
xenoarcheaology
Simple Animal Tweaks
2017-09-24 23:43:14 -04:00
xenobio
Shifts around a few Tech Levels.
2017-09-23 12:54:04 -05:00
xenobio2
Adds the Lost Drone
2017-09-22 01:17:53 -04:00
xgm
…