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
27,505 Commits 8 Branches 26 Tags
f8a38ec7cfddd9d43d0ce9687ea37503c9c74545
Commit Graph

12614 Commits

Author SHA1 Message Date
PsiOmegaDelta
f8a38ec7cf Improves powernet destruction. 
While we currently do hard del datums this is a step towards a better world.
 2015-09-16 08:00:22 +02:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +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
b9ee4ebc5e Merge branch 'master' into abandonedcrates 2015-09-10 15:21:15 -04:00
mwerezak
67fd31bd3e Abandoned crates now again use unique digits for their codes 2015-09-10 00:42:14 -04:00
mwerezak
c8fcdf5170 Makes coffee poisonous to tajaran 
Also fixes skrell protein toxicity not applying when protein is injected.
 2015-09-09 23:11:47 -04:00
mwerezak
a2c1bc1766 Adds apply_effect calls 2015-09-09 22:27:40 -04: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
HarpyEagle
5e6617e7e6 Cleans up living/say broadcast and verb logic 
Human say_quote() will use the language to obtain a speech verb while
silicon say_quote() will use synth speech verbs, so no need for the extra
language flag. Will mean that silicons will always use their synth speech
verbs regardless of language, however. Logic for what silicons use as
their verb should probably go in say_quote() anyways, so future updates to
that can go there instead of branching in living say code.
 2015-09-09 03:04:18 -04:00
mwerezak
5e478b58e8 Fixes #10746 
Stumps can now be amputated, but not removed by taking damage.
 2015-09-09 00:17:37 -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
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
PsiOmega
3a2b1be8e1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-07 08:09:01 +02:00
Zuhayr
787f48146e Merge pull request #10980 from GinjaNinja32/autohiss 
Add autohiss/purr on a per-client toggle
 2015-09-07 15:37:46 +09:30
PsiOmega
8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr
211e426009 Tweak. 2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50 Fixes #10951 2015-09-07 14:43:12 +09:30
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade 
Adds fragmentation grenades
 2015-09-07 14:12:27 +09:30
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes 
Fixes two runtimes
 2015-09-07 14:01:24 +09:30
Zuhayr
e0cfd8fdbd Merge pull request #10420 from Kearel/sbike 
[Feature] Space Bikes!
 2015-09-07 13:58:25 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
 2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
 2015-09-07 11:17:06 +09:30
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
Chinsky
9533f2d154 Merge pull request #11026 from GinjaNinja32/announcement 
Improve formatting of admin announcements
 2015-09-07 01:02:36 +03:00
Chinsky
47f382b892 Merge pull request #11027 from Datraen/master 
[BOTANY] Fixes plant nutrient storage unit check
 2015-09-07 01:02:21 +03:00
GinjaNinja32
a1b9dc2b4a Resomi language tweaks, fixes every species' names being generated in Galcom 2015-09-06 22:10:39 +01:00
Datraen
05a29f8f3a [BOTANY] Fixes plant storage nutrient check 
Reported only high, low or none with previous system.
 2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140 Improve formatting of admin announcements 2015-09-06 20:41:06 +01:00
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
Zuhayr
ef21f562fd Added some Resomi uniforms/loadout options. 2015-09-06 18:49:33 +09:30
Zuhayr
63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys 
Languages now use alternative prefix keys.
 2015-09-06 17:20:51 +09:30
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
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
348f678b81 Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess 
Observers can now view radio settings, admins can alter them.
 2015-09-05 16:59:42 +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
f8bf428e66 Merge pull request #10981 from comma/technoir 
MrSnapwalk's Detective Uniform Resprite
 2015-09-06 00:48:50 +09:30
Zuhayr
d03d9eebca removing now unneeded limb define. 2015-09-06 00:42:54 +09:30
Zuhayr
34a0c2f080 Added Resomi blood/damage masks. 2015-09-06 00:42:02 +09:30
Zuhayr
3e015d7c71 Added three human subspecies. 2015-09-06 00:39:08 +09:30
Zuhayr
808bbee90f Added species vars for oxy/tox/rad/flash resistance. 2015-09-06 00:39:05 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
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