Commit Graph

9168 Commits

Author SHA1 Message Date
oranges
90360e13d2 Merge pull request #29356 from ninjanomnom/shuttle-bugfixes
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 21:05:12 +12:00
ninjanomnom
9da8be52ed fixes one bug and brings another out of the woodwork 2017-07-18 23:03:16 -04:00
Ashe Higgs
b2b3ed5384 Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils (#29283)
* Silicons no longer take oxygen or toxin damage

* beep boop

* i'm a good coder!

* Makes toxin damage function like fire

* ||
2017-07-18 19:45:08 -04:00
Fox McCloud
c10c9442a5 Refactor Lung Handling (#29280)
* Refactor Lung Handling

* fix ups

* fixes
2017-07-18 10:58:23 -04:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
danno "big fucking moron" brando
9e969fd016 Augment Styles/Changes (#28977)
Full augment sets on the left, partial mix/match on the right.

This PR aims to make augmenting slightly more interesting than just turning your body grey, while also begin reminiscent of the cyborg parts that are actually used in the process.

Using the augment manipulator now found in robotics, one can insert a part and custom fit it to one of three different styles (security, engineering, and standard). Mix and match if you so choose, or make a full set for maximum style.
2017-07-18 18:35:01 +12:00
Ergovisavi
5cc484ebde Prevents the anomalous crystal from making fantasy into reality (#29299) 2017-07-17 22:02:14 -03:00
Joan Lung
ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Emmett Gaines
1d201939ba [Ready] Shuttle dock() rewrite (#29049)
A complete rewrite of the dock proc for shuttles to make it more maintainable and readable and also bring over some new features while we're at it. This allows for multi-area shuttles and more control over the effects of anything being moved.

Areas, and movable atoms all have (before|on|after)ShuttleMove procs, turfs have (from|to)ShuttleMove procs which are called the same as beforeShuttleMove.

All ShuttleMove procs have been moved to a single file in the shuttle module.

Stationary docks will have their baseturf_type and area_type modified in maps once the problems have been worked out.
2017-07-17 12:17:56 +12:00
kevinz000
b09e519584 Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#28551)
Click catcher now supports mousemove/mousedrag. Basically, mouse location can now be captured even if the user isn't mousing over a visible location
    Added procs to allow for projectiles to be fired with just an angle for pixel projectiles, instead of requiring a target turf and pixel x/y
    Added procs to get angle of user's mouse from their viewpoint (Time to rework gang machine guns again!)
    Beam rifles now have different zoom modes
    Free directional zooms out and tracks the angle of your mouse from the center of the screen. However, you can't target with very good accuracy on this (Shots can't be properly aimed on non dense objects/lying down mobs.)
    Locked directional zooms like free directional but doesn't automatically turn if your aim changes.
    Center view, just increases your view in all directions (2x weaker)
    No zoom mode, in which you just retain your normal view.
    You can select beam rifle zooming rates to be instant or stepped.
    Stepped zooming rates zoom out 5 tiles per second. This will likely help with people not being able to use it without lagging because their computers aren't as beefy!
    Beam rifles no longer require zoom to be fired
    Beam rifle aiming beams now instantly update instead of on process
    Beam rifle aiming beams are now one object instead of 150. This'll help with the lag caused by it during gameplay that I've observed.
    Angular penalty reduced by 0.1 for a nice even number.
    Instances of client.view = have been replaced with client.change_view() as that'll properly update the click catcher
    Hopefully shooting yourself in the face when you hit a blob tile or whatnot is fixed with the new and improved code..
2017-07-17 12:13:03 +12:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Jordan Brown
9539352210 Fixes monkeys trying to take offhands (#29257) 2017-07-16 00:31:58 -03:00
Jordan Brown
bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
Fox McCloud
2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
Jordan Brown
8f657c68fd Merge pull request #29252 from lzimann/praisebethefruit
Possibly fix player_list sometimes having a null
2017-07-15 11:07:51 -04:00
oranges
e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
Lzimann
896095e3f1 Corrects the check 2017-07-14 12:09:38 -03:00
Tacolizard
2b053f2a0e Organ Update [Cloning isn't broken edition] (#29223)
* initial

* add paranthesis

* add zones

* update DNA

* indent

* descriptions

* start refactor

* update dme

* paranthesis

* remove old proc

* refactor digestion onto stomach

* add handle_liver()

* fix

* add stabiliver

* add a warning for liver failure

* lower frequency of warning message

* switch to prob

* fix permissions

* forgot something

* change recipe

* implement liver damage

* change operator

* fix

* fix

* oh the irony

* rebalance

* refactor alcohol tolerance and add med scanning

* fix

* misc fixes, changes and refactors

* fix?

* remove src

* misc changes

* more bugfix attempts

* Update liver.dm

* Update stomach.dm

* FIXED!!!!

* preparation for rnd organs

* rename var

* string changes

* implement tox filtration

* fix

* fix

* fix

* toxin filtration v2

* misc fix

* fix

* fix

* should not be coding this late at night

* reee

* misc

* fix runtimes

* digest me

* typepeath

* add mutant support

* comment and spacing

* commentz

* typepath

* fixes

* fix?

* fix

* change

* plasmeme organs!

* Update liver.dm

* Update stomach.dm

* stabiliver => corazone

* cyberboss review

* cyberboss more like cyberBOOB

* okay cyberBOOB

* cyberBOOOOOb

* static list

* fix?

* fix

* ID please

* hows that for resolving name collision?

* Fix shit

* fixes cloning
2017-07-14 09:59:48 -04:00
Ashe Higgs
102d1cce25 Refactors screwdriver coloring to use greyscale (#29199)
* Removes some debug code

* get outta here!

* Replaces random sprites with the old colors

* Sorts out inhands

* Dynamics inhaaaaaands

* stop eavesdropping, world!

* Sprite updates

* Conflicts 1

* Conflicts!

* Conflicts 1

* No conflicts!
2017-07-14 13:53:28 +02:00
oranges
5494f5328a Rename Bump to Collide (#29207)
This reduces confusion arising from the fact byond already has a built
in byond proc also named Bump.

We used an argument called yes to distinguish our Bump from byond's
builtin bump, but then we failed to make sure everyone of our bumps
properly override it, so a bunch of things have been double bumping

This resolves that issue permanently

I've also removed the second argument as it no longer has a purpose

I also cleaned up the recycler bump as it didn't do anything the
parent procs didn't already do
2017-07-14 13:47:22 +02:00
Lzimann
d06493d6f6 Possibly fix player_list having a null 2017-07-14 00:27:41 -03:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000
7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
Jordan Brown
8c7fdf88c2 Cleans up carbons (#29179) 2017-07-12 10:15:34 +02:00
shizcalev
62b32d3f7a reverted organ refactor #28913
reverts #28913
2017-07-11 22:08:57 -04:00
Jordan Brown
78a2e5c4c3 Adds the hivebot invasion event (#28514)
Follow up to #23398

Xhuis & Cyberboss
add: New hivebot invasion event
2017-07-12 13:09:06 +12:00
bagil
efff1acc0b revert ff1198383a 2017-07-11 07:30:06 +00:00
tgstation-server
ff1198383a Merge commit '2a54776ac3468f964ee89ed5f3d1f3f91dcc705f' 2017-07-11 07:12:32 +00:00
MrStonedOne
2a54776ac3 testing version for test merge 2017-07-11 00:08:20 -07:00
kevinz000
6539fa2cb5 Refactors flightsuit code to hopefully be less dumb (#28033)
Refactors flightsuit code to be less crappy
2017-07-11 11:23:02 +12:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
Tacolizard
127003957b Organ Update: Refactors chemical and nutrient metabolization onto two new organs, the liver and the stomach. (#28913)
* initial

* add paranthesis

* add zones

* update DNA

* indent

* descriptions

* start refactor

* update dme

* paranthesis

* remove old proc

* refactor digestion onto stomach

* add handle_liver()

* fix

* add stabiliver

* add a warning for liver failure

* lower frequency of warning message

* switch to prob

* fix permissions

* forgot something

* change recipe

* implement liver damage

* change operator

* fix

* fix

* oh the irony

* rebalance

* refactor alcohol tolerance and add med scanning

* fix

* misc fixes, changes and refactors

* fix?

* remove src

* misc changes

* more bugfix attempts

* Update liver.dm

* Update stomach.dm

* FIXED!!!!

* preparation for rnd organs

* rename var

* string changes

* implement tox filtration

* fix

* fix

* fix

* toxin filtration v2

* misc fix

* fix

* fix

* should not be coding this late at night

* reee

* misc

* fix runtimes

* digest me

* typepeath

* add mutant support

* comment and spacing

* commentz

* typepath

* fixes

* fix?

* fix

* change

* plasmeme organs!

* Update liver.dm

* Update stomach.dm

* stabiliver => corazone

* cyberboss review

* cyberboss more like cyberBOOB

* okay cyberBOOB

* cyberBOOOOOb

* static list

* fix?

* fix

* ID please

* hows that for resolving name collision?

* Fix shit
2017-07-10 17:21:27 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jordan Brown
bd9c7c5d03 Merge pull request #29134 from RandomMarine/trynottobreaklaw2
Allows drones to switch to/from harm intent
2017-07-09 20:44:24 -04:00
Jordan Brown
4a2545c371 Merge pull request #29141 from Xhuis/curse_mob_fix
Necropolis curse mobs no longer fall into chasms
2017-07-09 20:44:07 -04:00
Jordan Brown
d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
RandomMarine
4b9ba464ce return of the return 2017-07-08 16:18:49 -07:00
Xhuis
c7d28736ec Curse mobs are now immune to chasms 2017-07-08 15:00:06 -04:00
Leo
65ca7de2be Merge pull request #29123 from Xhuis/catching_refactor
Refactors catching to use attack_hand
2017-07-08 15:18:42 -03:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
RandomMarine
d173597660 gives drones harm intent 2017-07-07 19:34:40 -07:00
Joan Lung
bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
Ergovisavi
796063c910 Adding the mook/wanderer mob for planetstation (#29046)
* Adding the mook/wanderer mob for planetstation

* Adds the two .ogg's for the mook mob

* mook fixes

* Mook fixes

* more fixes for mook

* Makes the mook's slash combo do an animation instead of just retaining the same pose

* reh
2017-07-07 15:15:31 -04:00
Xhuis
9a04270bc8 Refactors catching 2017-07-07 12:42:20 -04:00
Jordan Brown
c1e3ac82ec Merge pull request #29081 from Fox-McCloud/reflect-refactor
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
oranges
97fa94e9c6 Fix incorrect call to do_attack_animation (#29072)
This was causing a runtime as 1 is not a valid parameter
2017-07-06 22:41:39 -05:00
Shadowlight213
68102aaa0c Refactors speech/communication logging and adds coordinates to speech logs (#28997)
* Adds locations to speech and related communications
Refactors how logging is handled for these.

* changes

* ahhhhh

* preemptive merge conflict undoing maybe?

* Let's not delay this further
2017-07-06 16:06:43 -04:00
Joan Lung
bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00