variableundefined
e2f7b7e388
Deconflict once again
2018-10-21 10:18:15 +08:00
variableundefined
600de8ba24
Deconflict 1
2018-10-21 07:56:55 +08:00
variableundefined
d67059102e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RelPath
2018-10-20 15:14:12 +08:00
variableundefined
82d00ca7f7
Merge pull request #9894 from craftxbox/patch-1
...
add check to make sure person downloading pAI isnt dead.
2018-10-20 12:56:46 +08:00
craftxbox
2e8c655f67
add adjacent check too.
2018-10-20 01:56:21 -02:30
craftxbox
2a3e27e14d
use better dead checking methods.
2018-10-20 01:56:01 -02:30
variableundefined
152a350538
Deconflict
2018-10-19 16:07:04 +08:00
craftxbox
11c5d69660
remove \ref
2018-10-19 00:14:08 -02:30
Mark Mak
91dcf447ec
Merge pull request #9888 from Fox-McCloud/spark-refactor
...
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Mark Mak
4bc1a1c1ef
Merge pull request #9363 from MarsM0nd/Refactor_UID
...
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
craftxbox
bf878d9173
add check to make sure person downloading pAI isnt dead.
2018-10-18 17:21:47 -02:30
Fox McCloud
3825b4e1d5
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
Mark Mak
2368c2a5ee
Merge pull request #9849 from TDSSS/robo-flavour
...
Added examine text for borg module
2018-10-17 21:35:48 +08:00
Mark Mak
b418ee8401
Merge pull request #9828 from datlo/honkinfiltrationkit
...
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
TDSSS
b34be9f9e6
woops
2018-10-14 16:34:08 +02:00
TDSSS
a39c1737fa
Added examine text for borg module
2018-10-14 16:16:12 +02:00
Purpose
cf5ddc3077
check
2018-10-14 12:20:46 +01:00
variableundefined
c2dff9ba01
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ContainerTypeRefactor
2018-10-13 19:16:41 +08:00
Mark Mak
ea1ac49897
Merge pull request #9521 from alex-gh/damage_mod_fix
...
Species damage mod now only affects damage, not healing.
2018-10-13 11:32:11 +08:00
DarkPyrolord
f22e21a0e2
SpamBGone
2018-10-13 14:43:27 +13:00
variableundefined
65c246c1c9
TG container_type refactor
2018-10-13 08:20:52 +08:00
Mars
984339ce42
Merge-conflict fix + check for null rather than type.
2018-10-12 18:59:54 +02:00
datlo
ac5cc480b9
Adds the Honk Brand Infiltration Kit
...
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined
569f68b128
Merge branch 'master' into RelPath
2018-10-12 14:08:19 +08:00
variableundefined
376cdc709a
Merge pull request #9818 from farie82/twohanded-fix
...
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefined
4de5284557
Merge pull request #9677 from DesolateG/global
...
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466
Merge pull request #9343 from variableundefined/OreTGPort
...
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
Desolate
46dd98f4e0
oops
2018-10-11 16:26:06 -05:00
joep van der velden
c96adec91f
Fixed it
2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
variableundefined
03deae3a31
Merge pull request #9804 from Birdtalon/tpbug
...
Fixes mulebot teleportation bug
2018-10-11 01:44:11 +08:00
Birdtalon
83f906ad21
nulls load properly
2018-10-10 18:11:34 +01:00
variableundefined
309e3b04f6
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
Ty-Omaha
506b90c806
pai fix
2018-10-09 17:02:02 -04:00
alex-gh
38bc4fdbb8
You no longer scream and collapse non-stop when buckled into a chair without legs.
2018-10-09 13:39:40 +02:00
Mars
d9b60a7bfb
Fix merge conflict
2018-10-09 09:41:37 +02:00
variableundefined
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
Purpose
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
Birdtalon
b29a1418ab
updates resting var to use StopResting()
2018-10-08 12:22:46 +01:00
variableundefined
3100b29d05
Merge pull request #9398 from Birdtalon/set_species
...
Damage conservation on set_species, i.e. changeling transform no longer heals everything.
2018-10-08 13:10:05 +08:00
variableundefined
d1a682b3b4
Merge pull request #9768 from Crazylemon64/mining_mobs_fix
...
Mining mobs now update sprites correctly on death
2018-10-08 12:52:02 +08:00
Crazylemon64
6cc560e8f5
Mining mobs now update sprites correctly on death
2018-10-07 21:19:29 -07:00
Crazy Lemon
200efd05bd
Merge pull request #9459 from variableundefined/NPCPoolPort
...
SS Port: NPCAI & NPCPool
2018-10-07 21:01:30 -07:00
alex-gh
e10f0a5def
Species damage mod now only affects damage, not healing.
2018-10-08 05:37:13 +02:00
Crazylemon64
dc63265d94
Fixes bugs with AI examining and nearsighted updates
2018-10-07 20:24:32 -07:00
Crazylemon64
3db4229918
First big chunk of the refactor
...
mid-refactor of `take_overall_damage`
Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs
Allows the dead to examine
Removes the `blinded` var
Refactor cyborg components so vision loss is instant
Robot life/death updates instantly
Adds instant updates for damage overlays and HUD icons for humans
Final reconciliation with the species refactor
Adds a stat debugging system and debugging logs
Also fixes instant death on species change
"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would
I used it to fix people dying instantly when changing species due to
temporary deletion of the brain
Fox's requests
Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
variableundefined
8d4551a2cd
Merge pull request #9678 from farie82/fix-free-gene-stability
...
The cure procs for the disabilities now cure the gene as well
2018-10-07 15:28:16 +08:00
Purpose
63dfd411aa
Resolved merge conflicts... I hope.
2018-10-06 16:01:34 +01:00
Desolate
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
Birdtalon
0eeefda271
Merge branch 'master' into set_species
...
# Conflicts:
# code/game/gamemodes/changeling/powers/transform.dm
2018-10-05 23:41:34 +01:00
