cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,155 Commits 8 Branches 0 Tags
deb215d262caedfa368619bb3364a2bfc0f10e15
Commit Graph

22513 Commits

Author SHA1 Message Date
mwerezak
deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status. 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2016-04-22 04:57:23 -04:00
mwerezak
9ef3df66e3 Fixes missing ..() 2016-04-22 04:57:23 -04:00
mwerezak
c0ac25ec4b Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source 2016-04-22 04:57:23 -04:00
mwerezak
d4cbc49132 Prevents attacking yourself with items unless on harm intent 2016-04-22 04:57:22 -04:00
mwerezak
3c22e65399 Adds some documentation to item_attack.dm 2016-04-22 04:57:22 -04:00
mwerezak
11c5b10bb9 Refactors various item attack() implementations 
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-22 04:57:22 -04:00
mwerezak
593f7699db Refactors item_attack.dm 
Refactors and cleans up item_attack.dm and related mob attack code

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items.dm
	code/modules/mob/living/bot/bot.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-22 04:52:04 -04:00
Neerti
069e9c7e68 Merge pull request #1470 from Hubblenaut/smes 
Changes to SMES Interface
 2016-04-21 21:09:42 -04:00
Neerti
7c0973a44b Merge pull request #1471 from Yoshax/ivfix 
Adds a check to ensure only living mobs can attach and detach IVs
 2016-04-21 21:08:45 -04:00
Neerti
6d15cb3731 Merge pull request #1472 from Yoshax/paifix 
Stops pAIs from dragging people, corpses, etc
 2016-04-21 21:08:33 -04:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels 
Adds EMT Duffelbags
 2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes 
Normalises medical item storage size + fixes
 2016-04-21 21:07:34 -04:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo 
Mob inventory cleanup, part 2
 2016-04-21 21:07:22 -04:00
Yoshax
78d8caed83 Stops pAIs from dragging people, corpses, etc 2016-04-22 01:33:25 +01:00
Yoshax
81dfe5d9c2 Adds a check to ensure only living mobs can attach and detach IVs 2016-04-22 01:15:07 +01:00
Nerezza
983aa8cf56 Wizard Federation Redacted 
What illuminati?
 2016-04-21 18:05:09 -05:00
Hubblenaut
3d9a558712 Changes to SMES 
- Transition to using kilowatts and kilowatt hours
 - Adds an input load bar with value
 - SMES charge rate and coil capacities slightly adjusted for using
   kilowatt units
 2016-04-22 00:58:11 +02:00
Nerezza
24cd704115 Adds EMT Duffelbags 
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
 2016-04-21 16:37:43 -05:00
Nerezza
42eaadb4e5 Skrell can speak Schechi instead of Teshari now 2016-04-21 12:02:35 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes 
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
 2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Anewbe
40ce9dc904 Gives Breacher helmets force 5, makes their headbutts more dangerous 2016-04-20 22:10:44 -05:00
Neerti
a1faf6e497 Merge pull request #1428 from ParadoxSpace/DionaLightFix 
Fixes Diona Light Gain
 2016-04-20 12:12:45 -04:00
Datraen
2b53efdfd5 Merge pull request #1303 from Hubblenaut/hydro 
Full fertilizer bottles of type glass/bottle
 2016-04-20 11:31:31 -04:00
HarpyEagle
6b7d40b75f Fixes confused movement for walking/running, adjusts behaviour 2016-04-20 16:49:33 +02:00
HarpyEagle
bf3253ca28 Running into things while confused Weakens instead of Paralyzes. 
Fixes incorrect use of take_organ_damage
 2016-04-20 16:49:14 +02:00
Yoshax
26192e2b32 Fixes an error 2016-04-20 15:36:13 +01:00
PsiOmegaDelta
a3f8bc815e Round start timer now remains at 0 until the round actually starts. 2016-04-20 15:27:59 +01:00
EmperorJon
ebeaddea6e Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar 
Fixes some punctuation
 2016-04-20 13:23:51 +01:00
EmperorJon
8d2370bd65 Merge pull request #1445 from Anewbe/veymed_prosthetics 
Adds Vey-Med prosthetic limbs.
 2016-04-20 13:23:07 +01:00
EmperorJon
7b793634b2 Merge pull request #1451 from SinTwo/minimalist-ui 
Adds a new UI style - Minimalist
 2016-04-20 13:22:55 +01:00
EmperorJon
9201240f33 Merge pull request #1446 from Yoshax/followfix 
Adjusts check to fix double click moving as observer
 2016-04-20 13:22:46 +01:00
EmperorJon
8596e303e3 Merge pull request #1430 from mwerezak/living-life-fix-polaris 
Human Life Fixes
 2016-04-20 13:22:18 +01:00
EmperorJon
89d5175e12 Merge pull request #1438 from Datraen/GameModes2 
Adds three new mixed modes.
 2016-04-20 13:21:31 +01:00
Hubblenaut
2b44de88b1 Change to absolute pathing 2016-04-20 13:21:35 +02:00
SinTwo
57b8808a53 Adds a new UI style 
minimalist.dmi
 2016-04-19 21:46:19 -04:00
Datraen
c6f2b0f76d Merge pull request #1447 from Yoshax/safetyfiring 
Fixes a typo on the new preference
 2016-04-19 21:12:35 -04:00
Yoshax
4e8ac2515d Further fixes typos 2016-04-19 23:49:57 +01:00
Yoshax
7ae719aea7 Fixes a typo on the new prefence 2016-04-19 23:09:54 +01:00
Yoshax
e6392ee5d1 Adjusts check to fix double click moving as observer 2016-04-19 18:08:08 +01:00
Datraen
c24ba09834 Bumps up MercenaryRenegade gamemode requirement. 2016-04-19 13:05:05 -04:00
EmperorJon
28ab131610 Merge pull request #1441 from Yoshax/clickcooldownfix 
Adds click cooldowns for attacking non-mob atoms for various mob types +other
 2016-04-19 17:58:03 +01:00
Datraen
a3df9e6eba Merge pull request #1429 from Yoshax/safetyfiring 
Adds a new verb/preference to toggle requirting help intent to fire weapons
 2016-04-19 11:44:53 -04:00
Anewbe
29b9935411 Adds Vey-Med prosthetic limbs. 2016-04-18 18:50:54 -05:00
Datraen
c3af56e9f3 Merge pull request #1443 from Yoshax/tablecliming 
Reduces table climbing time by one third
 2016-04-18 16:10:17 -04:00
Yoshax
a77d9269b0 Reduces table climbing time by one third 2016-04-18 18:29:03 +01:00
EmperorJon
47f715805e Merge pull request #1442 from Yoshax/drinksloadout 
Loadout (vacuum-)flask contents now configurable.
 2016-04-18 16:33:42 +01:00
Yoshax
f0c69e663d Fixes error 2016-04-18 15:53:09 +01:00
PsiOmegaDelta
2e6f2c53a6 Loadout (vacuum-)flask contents now configurable. 
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
 2016-04-18 15:30:26 +01:00
HarpyEagle
5faf635fae Adds click cooldown for certain cleanables 2016-04-18 15:27:12 +01:00