Commit Graph

128 Commits

Author SHA1 Message Date
Zuhayr fa8ee58183 Fixes a monkey runtime and updates head reattachment surgery. 2015-04-04 20:03:54 -07:00
Zuhayr 2ae7c93582 God dammit copypaste before commit. 2015-04-03 18:47:59 -07:00
Zuhayr 29cd70cbdd Fixes robot limbs not spawning subparts. 2015-04-03 06:44:52 -07:00
Zuhayr eeee0dfb9f Numerous runtime/oversight fixes. 2015-04-03 06:12:36 -07:00
Zuhayr 8def76f849 Removing some debugs. 2015-04-01 18:06:46 -07:00
Zuhayr 84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Zuhayr 294a1ff1f1 Should fix #8710 2015-04-01 17:27:06 -07:00
Zuhayr c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
mwerezak 01ce8d4a1f Fixes #8696
Fixes #8696, and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
= 2e728cfd4b Added macros for droplimb flags. 2015-03-31 11:42:45 +10:30
= 601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
PsiOmega 464d702d4b Mob refactoring.
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
Zuhayr 8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
Zuhayr 97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr f017764e64 More work on adjusting/tweaking/fixing the limb port to make it functional. 2015-03-25 00:59:17 +10:30
Zuhayr a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
Zuhayr b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
Zuhayr bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
2015-03-05 08:05:44 +01:00
Chinsky b0be5a90ff Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time. 2015-03-03 13:37:26 +03:00
Chinsky acfd99e33c Surgery now shows up on mob, in all gory glory. 2015-02-21 16:31:44 +03:00
Chinsky f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Kelenius 0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
Zuhayr aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
Chinsky 6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
Kelenius 6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Chinsky 0a7185c20a Fixes #7787
Made clean surgical amputation not cause huge wounds. Also moved code around a bit to prevent situations where missing limbs would get wounds (ie hands giving wounds to arms during recursive droplimb).
2015-01-15 18:59:39 +03:00
Chinsky 6f8618ded8 Fixes surgery steps never failing 2015-01-15 18:04:10 +03:00
Zulker Nayeen Nahiyan 935448c098 Merge branch origin/dev into dev 2015-01-10 02:25:26 +06:00
Zulker Nayeen Nahiyan 6e550d7308 Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation
`maths.dm`:
	Rewrite `Gcd(x)` to remove recursive behaviour.
	Remove `RaiseToPower(x)` and its usage from `event_manager.dm`.
	Rename `Lerp()` to `Interpolate()`.
	Add `Square(x)`, which squares a number.
	Rearrange most of the functions in the file. (trigonometric functions together, etc.)

`type2type.dm`:
	Rewrite `num2hex()` and optimise `hex2num()` for superior clarity and a 100% speed improvement.
	Correct indenting, spaces, make switches more concise.

`time.dm`:
	Remove old, slanderous commented-out function `/proc/time_stamp()`

`lists.dm`:
	Add the macros, `BITTEST(bitfield,index)`, `BITSET(...)`, `BITRESET(...)`
	  and `BITFLIP(...)` for bit-manipulation and use them where 20+ files
	  do it manually, for arguments of reader clarity and standardness.
2015-01-09 21:55:11 +06:00
Zuhayr fd311a412f Fixes #7742. 2015-01-09 08:58:11 +10:30
Zuhayr f43f58380c Fixes #7703 2015-01-09 08:26:53 +10:30
Zuhayr 4b030f30cd Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs. 2014-12-24 16:06:00 +10:30
Zuhayr bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr 2b525372f1 Fixes #7238 2014-12-07 11:52:29 +10:30
Zuhayr 37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr 96e57fc091 Bunch of minor fixes for xenomorphs and borer husks. 2014-10-07 08:54:05 +10:30
Zuhayr b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr 9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Whitellama f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Zuhayr cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
Kelenius a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
LightningIron 7de4825a87 Changes some messages to make more sense 2014-08-24 14:09:39 -05:00
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30