cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
17a64bebeaadd40ac31b4e40154e0c0feb2161c3
VOREStation/code/modules
History
Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
2016-05-12 13:02:51 -04:00
..
admin
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
alarm
Camera fixes and performance tweaks.
2016-03-21 17:30:52 -04:00
assembly
Issue #4 - Porting resize (micro/macro) systems.
2016-05-08 23:11:03 -04:00
awaymissions
…
blob
…
client
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
2016-05-12 13:02:51 -04:00
clothing
Merge pull request #1551 from Zuhayr/master
2016-05-11 02:34:50 -04:00
customitems
Ports Byond 510 preperations from Bay
2016-03-14 18:21:44 +00:00
detectivework
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
economy
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
events
Construction Update
2016-03-25 16:02:36 -04:00
examine
…
ext_scripts
…
flufftext
Ports Byond 510 preperations from Bay
2016-03-14 18:21:44 +00:00
food
…
games
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
genetics
…
ghosttrap
…
holodeck
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
hydroponics
Issue #4 - Porting resize (micro/macro) systems.
2016-05-08 23:11:03 -04:00
icon generation
…
library
Construction Update
2016-03-25 16:02:36 -04:00
lighting
…
maps
…
materials
Reinforced Walls
2016-04-15 16:41:33 +02:00
mining
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
2016-05-12 13:02:51 -04:00
multiz
…
nano
Merge pull request #1455 from Yoshax/gendertweak
2016-05-05 10:18:25 -04:00
organs
Merge pull request #1551 from Zuhayr/master
2016-05-11 02:34:50 -04:00
overmap
…
paperwork
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
power
Made slimes more interesting.
2016-05-06 04:07:52 +09:30
projectiles
Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns
2016-05-11 01:51:13 -04:00
random_map
Merge pull request #1027 from Kelenius/mobCleanup
2016-03-18 13:50:47 -04:00
reagents
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
2016-05-12 13:02:51 -04:00
recycling
Buildables v1.2 (#1517)
2016-05-03 22:18:12 +01:00
research
Buildables v1.2 (#1517)
2016-05-03 22:18:12 +01:00
scripting
Ports Byond 510 preperations from Bay
2016-03-14 18:21:44 +00:00
security levels
Construction Update
2016-03-25 16:02:36 -04:00
shieldgen
…
shuttles
…
spells
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
supermatter
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
surgery
Merge pull request #1479 from Yoshax/limbfixes
2016-05-11 01:53:58 -04:00
tables
…
vehicles
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
virus2
Fixes #1171
2016-03-21 14:22:44 +03:00
vore
Merge pull request #45 from VOREStation/tailsnears-4
2016-05-11 23:40:27 -04:00
xgm
…