cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-09-01 00:16:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,533 Commits 66 Branches 25 Tags
0d91ca0dfddfb2db26685b0006d6a8ea2f790a7c
Commit Graph
12631 Commits
Author SHA1 Message Date
PsiOmega 0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
 2015-09-13 10:52:01 +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 26f533bb01 Merge pull request #11076 from PsiOmegaDelta/dev 
Dev
 2015-09-12 13:17:47 +02:00
PsiOmega e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-09-12 13:10:29 +02:00
PsiOmega 834d93df00 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-12 12:51:22 +02:00
Chinsky adf19d674b Merge pull request #11055 from mwerezak/coffee-fix 
Returns coffee jitteriness to an overdose effect
 2015-09-11 22:49:35 +02:00
Chinsky 83f4425826 Merge pull request #11062 from Sligneris/patch-5 
Sensors - removing the random period from the action verb
 2015-09-11 22:49:28 +02:00
SomeoneElse 7e4191d212 [minor] Fix ATM transfer code, remove badly placed 'break'. 
code/modules/economy/Accounts.dm:
	remove break from charge_to_account()
 2015-09-11 16:44:00 +06:00
GinjaNinja32 8536fb08eb Merge branch 'dev' into vv 2015-09-11 08:06:44 +01: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 e1e47ac189 Merge branch 'master' into coffee-fix 2015-09-11 00:54:47 -04:00
mwerezak b9ee4ebc5e Merge branch 'master' into abandonedcrates 2015-09-10 15:21:15 -04:00
Sligneris 7b2041ea1d Sensors - removing the random period 2015-09-10 20:48:25 +02: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
GinjaNinja32 3a952d26df Replace ';' with '; // do nothing' for clarity 2015-09-10 04:00:37 +01:00
GinjaNinja32 4ed33603c2 Implement VV header and options for virus2 datums 2015-09-10 03:58:10 +01:00
mwerezak a2c1bc1766 Adds apply_effect calls 2015-09-09 22:27:40 -04:00
GinjaNinja32 be2279106f Merge remote-tracking branch 'upstream/dev' into vv 
Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm
 2015-09-10 03:06:27 +01:00
mwerezak 19b195cd27 Revert "Reverts #10649, fixes #10621" 
This reverts commit cb5df3963a.
 2015-09-09 21:12:24 -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