cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 16:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,021 Commits 66 Branches 25 Tags
070ca0adea809da3fd4128beb2ed440646e66bc1
Commit Graph
2864 Commits
Author SHA1 Message Date
PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Chinsky debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
PsiOmegaDelta fd3370c01f Fixes #11263. 
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
 2015-10-10 10:11:48 +02:00
GinjaNinja32 d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle fa661f998f TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
 2015-10-08 23:26:05 -04:00
PsiOmegaDelta bd7c475fcc Stack material use now depends on charge costs. 
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
 2015-10-08 20:29:39 +02: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
Kelenius baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
Kelenius 3c4369823f Fixes for jetpacks 
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
 2015-09-14 16:35:52 +03: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
Vivalas ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00
mwerezak f69c723d40 Made flares a bit brighter 2015-09-09 20:42: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 ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +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 0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr 88b95e1207 Fixes #7951 2015-09-07 14:40:23 +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
PsiOmega cc960624b9 Fixes mercenary mode not listing bought items. 
The mercenary leader now spawns with the uplink, as is set as its owner.
 2015-09-06 10:43:09 +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
Zuhayr 23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmegaDelta 88250ad57f Merge pull request #10939 from Baystation12/master 
Dev-freeze
 2015-08-30 10:20:32 +02:00
PsiOmega 22262507b9 Only living mobs now trigger shrapnel. 
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
 2015-08-29 10:03:58 +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
HarpyEagle e03585898d Cleans up flashlight fix 
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
 2015-08-24 16:31:31 -04: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
PsiOmegaDelta 0b163b89ae Fixes #10815. 
Now uses audible message. Added a message for deaf mobs.
 2015-08-24 09:16:35 +02:00
Chinsky 1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1 
Flashlight Icon toggle fix
 2015-08-24 00:40:26 +03:00
Zuhayr 89f498e3e8 Merge pull request #10811 from mwerezak/qdel 
Fixes
 2015-08-23 07:41:10 +09:30
mwerezak 13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
GinjaNinja32 4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr 3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
FrickenChris101 a4b3ab1ca5 Flashlight Icon toggle fix 
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
 2015-08-19 20:17:59 -04:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmega 21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
Snapshot 5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak 133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
PsiOmegaDelta 3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
 2015-08-14 08:34:42 +02:00
PsiOmegaDelta d1e8f670b2 qdel(reagent) adjustments. 
Attempts to ensure qdel(reagents) only occur once per Destroy()
 2015-08-13 10:26:31 +02:00
PsiOmegaDelta 1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-08-13 09:01:10 +02:00
GinjaNinja32 792d6e2864 Merge pull request #10579 from mwerezak/misc 
Fixes
 2015-08-12 22:21:34 +01:00
HarpyEagle 19fbc71249 Removes req_amount from stack_recipe_list 
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
 2015-08-12 15:54:16 -04:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
Chinsky 0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew 
Fixes the One Crew Member module.
 2015-08-12 20:38:52 +03:00
HarpyEagle a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
PsiOmegaDelta 249db0b03d Fixes the One Crew Member module. 
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
 2015-08-12 14:42:52 +02:00