cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-16 08:38:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,939 Commits 9 Branches 26 Tags
de9e68cdcdb90dec0472f13bc4eabbc9a41f3494
Commit Graph
5979 Commits
Author SHA1 Message Date
PsiOmegaDelta de9e68cdcd Merge pull request #11151 from Baystation12/master 
Dev-freeze
 2015-09-19 21:25:15 +02:00
PsiOmegaDelta 9946c837e4 Merge pull request #11134 from Baystation12/master 
Dev-freeze
 2015-09-18 08:50:11 +02:00
PsiOmegaDelta f65649c8ba Fixes Pun-Pun (and other monkeys) pushing people around. 
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
 2015-09-17 09:40:19 +02:00
Chinsky 5d1b1cd123 Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice 
Prevents observer mice from spawning on the admin Z-level.
 2015-09-17 05:42:15 +03:00
PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
mwerezak db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
PsiOmegaDelta bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
PsiOmega a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega 830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
PsiOmega 8d57b2d0a0 Fixes observers being unable to see silicon antag status. 
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.

It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
 2015-09-12 14:39:10 +02:00
PsiOmegaDelta 0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
mwerezak 8e66d3b31a Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon 
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
 2015-09-09 19:49:46 -04:00
PsiOmegaDelta 2007004f3c Qdel cleanup. 
Replaces a few instances of del() with qdel().
 2015-09-09 12:20:33 +02:00
mwerezak cfa82e0c5e Allows resisting while restrained, prevents stop-drop-and-roll while buckled. 2015-09-09 03:11:09 -04:00
PsiOmegaDelta 30069d1dce Merge pull request #11044 from Kelenius/beepskyFixes 
Makes beepsky less brutal
 2015-09-08 10:41:30 +02:00
Kelenius 388159c7f1 Makes beepsky less brutal 
Fixes #10979
Fixes beepsky beating up handcuffed people
 2015-09-08 11:36:55 +03:00
Zuhayr 9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-09-07 11:03:41 +09:30
Samuel Novák 12a0bae5bd Stop resting when pAI chassis collapses 2015-09-05 21:53:21 +02:00
GinjaNinja32 8685ff42a4 Merge pull request #11008 from Zuhayr/antaghud 
Refactored the antagHUD to work better with the new antagonist system.
 2015-09-05 17:01:57 +01:00
GinjaNinja32 ef208a55aa Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents 
Vent crawling now explicitly checks for equipped items.
 2015-09-05 16:59:33 +01:00
Zuhayr 90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
PsiOmega 69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr 23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmega 1f39768ce1 Vent crawling now explicitly checks for equipped items. 
Fixes #10991.
 2015-09-04 08:09:05 +02:00
Chinsky 9728f28880 Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech 
Relocates Cult/Occult languages to unused keys.
 2015-09-03 20:37:16 +03:00
PsiOmega d78db0231b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-02 14:42:27 +02:00
PsiOmega 6e2514d728 Beepsky should no longer attempt to arrest himself. 
Adds additional threat check.
 2015-09-01 18:25:51 +02:00
Chinsky 667debfb3c Merge pull request #10745 from mwerezak/mob-grab 
Cleans up mob_grab.dm
 2015-09-01 12:58:50 +03:00
Zuhayr 7581717246 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	maps/exodus-1.dmm
 2015-09-01 10:55:19 +09:30
Zuhayr 14c57fcf11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
 2015-08-31 16:17:24 +09:30
Zuhayr ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
Zuhayr 7d82e4850e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-29 16:53:07 +09:30
Zuhayr 165f30b274 Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime 
Alters the round duration format, increases Stat inactivity timeout.
 2015-08-29 07:41:23 +09:30
mwerezak 3e967872a3 Allows grabs to be resisted while weakened 2015-08-28 14:08:59 -04:00
Daranz d5b618adac Fix Say ":i" working with intercoms, re-add restraint check for Say ":i" 
See also commits:
e9d9ff57ba
bbc8ad6383
b9dbeeb356
 2015-08-28 17:33:52 +02:00
PsiOmega c5e09c30d6 Alters the round duration format, increases Stat inactivity timeout. 
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
 2015-08-27 20:01:38 +02:00
PsiOmegaDelta d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
Zuhayr 701282d2b0 Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping 
Must now be adjacent to mobs you are stripping.
 2015-08-27 06:51:54 +09:30
PsiOmegaDelta 9c5aba72f0 Must now be adjacent to mobs you are stripping. 
Fixes #10884.
 2015-08-26 08:12:02 +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
Kearel ea402d6714 #10833 + 2015-08-24 19:20:56 -05:00
Kearel d1504b49b9 Fixes #10833 2015-08-24 18:12:38 -05: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
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 ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
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
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