cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-04 04:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 9 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

12971 Commits

Author SHA1 Message Date
Chinsky 905b414da0 Merge pull request #10866 from Kearel/fix 
Fixes #10834, #10836, #10833
 2015-08-25 20:53:20 +03:00
Zuhayr b7c95f9c00 Merge pull request #10880 from Baystation12/dev-freeze 
Dev freeze
 2015-08-26 03:22:06 +09:30
Zuhayr 950359f629 Merge pull request #10873 from GinjaNinja32/nanoui 
fix #7884, fix #10859
 2015-08-26 03:19:51 +09:30
Zuhayr f4d27e8b1c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/admin/verbs/adminsay.dm
 2015-08-26 03:09:11 +09:30
PsiOmega 949cfdfc5b Restores special admin color in Msay 
Restores the special appearance admin name's had when using MSAY, to differentiate them from the masses.
 2015-08-25 19:06:52 +02:00
Techhead0 14d940eac6 Changes .loc= to .forcemove in magboots.dm, rig.dm, and void.dm. 2015-08-25 09:58:44 -04:00
Ccomp5950 2a38a18c4c Merge pull request #10831 from mwerezak/msay 
Changes MSAY to show the ckey/character name like it does with asay
 2015-08-25 09:48:20 -04:00
Kelenius 1ac8b94427 Fixes a few issues with the mechfab, fixes #10852 2015-08-25 12:28:20 +03:00
GinjaNinja32 c1ff84dd97 properly fix #7884 2015-08-25 09:11:23 +01:00
GinjaNinja32 ec043ea392 Revert "Revert "Fixes #7884, should fix #10859"" 
This reverts commit c1dc9d3f7e.
 2015-08-25 09:10:11 +01:00
PsiOmegaDelta 2fdf859122 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-25 08:20:13 +02:00
PsiOmegaDelta 713a7bd654 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/flashlight.dm
 2015-08-25 08:12:39 +02:00
Zuhayr f4c9bc4be6 Amending some loc setting lines. 2015-08-25 12:40:09 +09:30
Zuhayr 9087466552 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 2015-08-25 12:29:59 +09:30
Techhead0 ccaecf4a4e RIG boots may now be worn over shoes. 
Changes rig/proc/toggle_peice() to allow RIG-based magboots to be worn over shoes.
 2015-08-24 20:56:11 -04:00
Chinsky c1dc9d3f7e Revert "Fixes #7884, should fix #10859" 2015-08-25 03:35:19 +03:00
Kearel ea402d6714 #10833 + 2015-08-24 19:20:56 -05:00
Kearel d1504b49b9 Fixes #10833 2015-08-24 18:12:38 -05:00
Kearel c7d0496b20 Fixes #10834 2015-08-24 18:05:09 -05:00
Zuhayr bcca0d4aee Merge pull request #10842 from mwerezak/showers 
Fixes cryogenic showers
 2015-08-25 07:38:19 +09:30
Chinsky 5dbd5252d6 Merge pull request #10862 from GinjaNinja32/nanoui 
Fixes #7884, should fix #10859
 2015-08-25 00:40:01 +03:00
GinjaNinja32 a2c121ed50 Fixes #7884, should fix #10859 2015-08-24 21:59:12 +01:00
PsiOmegaDelta 57465d0dfb Tries to relocate Cult/Occult languages to unused keys. 
Now uses f and y. Fixes #10799.
 2015-08-24 17:35:56 +02:00
PsiOmega f28fa29d54 Having organs should no longer prevent vent crawling. 2015-08-24 17:27:22 +02:00
Kelenius dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
 2015-08-24 18:16:36 +03:00
PsiOmega 1a11aa7f5c Shuffles de-equipping logic. 2015-08-24 14:24:31 +02:00
PsiOmegaDelta 3de6d1b19c Merge pull request #10381 from Zuhayr/hardsuitcontrol 
Rig AI movement and module control buffs.
 2015-08-24 12:04:31 +02:00
Zuhayr 77e0a72911 Adding tag to droppod mobs prior to being moved into the target area. 2015-08-24 19:13:43 +09:30
Zuhayr c5972cb421 Removing an istype() check. 2015-08-24 19:03:57 +09:30
Zuhayr 3415f88cc2 Reverting a nonfunctional H to usr change. 2015-08-24 19:02:34 +09:30
Zuhayr c6964a9b0e Fixes for previous commits. 2015-08-24 18:31:52 +09:30
PsiOmegaDelta e29f4eb3c1 Compilation and map merge fixes. 2015-08-24 10:45:08 +02:00
PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-08-24 10:31:30 +02:00
PsiOmegaDelta c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
Zuhayr 23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
Zuhayr e8bf2e4b8f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 2015-08-24 16:41:39 +09:30
Zuhayr ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
mwerezak 75f19938b3 Fixes an apparent clonexadone typo 2015-08-24 00:04:03 -04:00
Kearel e8b779a34a language bug fix 2015-08-23 22:37:32 -05:00
mwerezak 09f1c6054b Changed MSAY to show the ckey/character name like it does with asay 2015-08-23 20:27:56 -04:00
mwerezak 5bcede5801 Fixes adjustBrainLoss 
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
 2015-08-23 20:22:15 -04:00
mwerezak 7c96829ecd Fixes #10828 
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
 2015-08-23 18:19:22 -04:00
Neerti 7fab70767d colony-1 could not be saved, unfortunately. RIP 2015-08-23 18:04:47 -04:00
Chinsky 13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix 
Fixes limb stump examine text
 2015-08-24 00:31:05 +03:00
Ccomp5950 517b685950 Merge pull request #10822 from mwerezak/antag-fix 
Antag Fixes
 2015-08-23 16:24:42 -04:00
mwerezak 3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -04:00
mwerezak 161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
PsiOmega 579c5be239 Makes observers use forceMove. 
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
 2015-08-23 17:45:46 +02:00
GinjaNinja32 663aae9786 Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny 
Rig AI fixes.
 2015-08-23 13:33:24 +01:00
volas d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00