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
Supermichael777
79c01530fb
Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. ( #28877 )
...
* Hopefully I didnt fuckup massivly
* I hope this works
* adds a disconect mesage
* adds disconnect message
* im a newb
* by request
2017-07-06 10:52:50 -04:00
Ashe Higgs
5f79b40bcd
Cleans up posibrain code ( #29008 )
...
* Cleans up posibrain code
* Tweaks at maintainer request
* I'm soorryyyyy!
* then uninformed they shall be!
2017-07-06 10:43:05 -04:00
Jordan Brown
ec0f0ca7c7
Merge pull request #29032 from ChangelingRain/minertweak
...
Tweaks the blood-drunk miner
2017-07-06 10:39:35 -04:00
kevinz000
01e39d19fd
Replaces all instances of spawn() with addtimer/INVOKE_ASYNC ( #28958 )
...
* spawn removal
* missed a rp
* missed a var
* vars
* stuff
* ok
* Update disposal-unit.dm
* Update disposal-structures.dm
* Update tooltip.dm
* Update experimentor.dm
* Update disposal-unit.dm
* Update experimentor.dm
2017-07-06 10:13:44 -04:00
Fox-McCloud
380e938dae
Minor Projectile Reflection Refactor
2017-07-06 02:45:30 -04:00
Jordan Brown
70abaeee64
Merge pull request #29036 from Xhuis/heartbeat_fix
...
Fixes heartbeat sounds playing indefinitely in certain cases
2017-07-05 16:40:22 -04:00
PKPenguin321
2d599e1b97
Adds the circle game ( #28961 )
...
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm
* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand
* adds a message to the user when emote fails
* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm
* defines, a fix
* undoes last two commits
2017-07-04 22:25:51 -04:00
Xhuis
c7aa8c1f32
Fixes infinite heartbeat sounds
2017-07-04 13:46:48 -04:00
Joan Lung
fca41fd2ee
we don't talk about that
2017-07-04 12:34:34 -04:00
Joan Lung
b0e30ba089
Tweaks the blood-drunk miner
2017-07-04 12:32:10 -04:00
Jordan Brown
9a5a2a35aa
Merge pull request #28966 from ChangelingRain/minerruins
...
Actually adds the blood-drunk miner ruins
2017-07-02 22:57:57 -04:00
Joan Lung
888b2e093e
Makes the lavaland pressure check a proc ( #28954 )
...
* Makes the lavaland pressure check a proc
* code that probably did nothing tm
* sss
* 50 should be a define instead
2017-07-02 20:14:42 -04:00
Ergovisavi
f5d800a06d
Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
...
# Conflicts:
# icons/effects/96x96.dmi
2017-07-01 16:20:05 -07:00
Leo
bf72887e38
Merge pull request #28903 from Cyberboss/swarmerfix
...
Swarmer cleanup
2017-07-01 18:14:54 -03:00
MoreRobustThanYou
8280b63985
Fixes deathgasping while being cloned ( #28949 )
2017-07-01 18:11:53 -03:00
Joan Lung
f6ad5996f3
Rethemes the ash walker nest to match the Necropolis ( #28886 )
...
* Rethemes the Necropolis
* clen
* not clever enough, hmm...
* that's a bug. hello, bug.
* no message
* a terrifying Legion room. full of one (1) Legion.
* some tweaks, inside has actual floor type
* tweaks
* Rethemes the ash walker nest to match the necropolis
* fix some issues with the door version
* whoops
* run mapmerge tgm, does not tgm
* whoops
* whoops, all dirs
* tgm
* The bonfire has a grill
* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
Ergovisavi
1a118c0651
Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
...
# Conflicts:
# icons/effects/96x96.dmi
2017-06-30 21:31:32 -07:00
Ergovisavi
c51ac78421
More leaper stuff
2017-06-30 21:16:44 -07:00
Joan Lung
5ab0992bbb
slightly more huntery
2017-06-30 23:24:01 -04:00
Joan Lung
be746c1946
Actually adds the blood-drunk miner ruins
2017-06-30 23:20:16 -04:00
Joan Lung
a110e881ad
Adds the blood-drunk miner as a potential mining "mini" boss ( #28829 )
2017-06-30 22:39:49 -03:00
Ergovisavi
5c5c7b7470
Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution ( #28730 )
2017-06-30 22:38:30 -03:00
Ergovisavi
4ab451e6ab
More leaper fixes
2017-06-30 17:23:29 -07:00
Jordan Brown
24de3629fb
Merge pull request #28941 from optimumtact/bananaphone
...
use_power var now uses a define to reflect it not being a bool
2017-06-30 19:28:30 -04:00
