Commit Graph

27 Commits

Author SHA1 Message Date
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera
524520cb8b Shards only do damage if you hit things with them (#6478) 2019-10-20 17:55:27 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm
Shards Do Damage to Holder
2019-08-28 01:25:47 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Yoshax
058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Kelenius
25e7dbb86f Cuts down shard spam 2016-03-14 14:46:43 +03:00
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
PsiOmega
6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
2015-08-30 10:23:14 +02:00
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
HarpyEagle
c136bd47cc Improves shard-stepping 2015-08-18 17:01:39 -04:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
HarpyEagle
fc7e89380e More material renames
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
Iamgoofball
32a5582215 Fixes #10085 (probably)
if this doesn't fix it then ????
2015-07-10 02:32:35 -07:00
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
Zuhayr
7d9378748d Comments out fire and rads for material objects since they are very imbalanced atm. 2015-06-20 22:48:08 +09:30
GinjaNinja32
c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr
f27ddd548f Restructuring a bunch of files in prep for widespread path changes. 2015-05-16 20:09:28 +09:30