Commit Graph

507 Commits

Author SHA1 Message Date
Fox McCloud
4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Fox McCloud
122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +01:00
Arkatos1
840929e0a8 Custom icons for Guardian action intents! 2019-03-13 19:23:27 +01:00
Arkatos1
f38f1a0a81 Adds intent UI for guardians 2019-03-12 16:14:07 +01:00
variableundefined
e19b61662f Merge pull request #10736 from datlo/ghettosurgeryfix
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
2019-01-31 11:29:09 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot
Discord Bot Functionality
2019-01-29 10:43:51 +08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals
Adds a new clown chemical 🤡
2019-01-28 06:11:38 +08:00
Kyep
f24b8ecb68 Fixes runtime in item_attack.dm #24 2019-01-26 16:10:00 -08:00
Citinited
eebd8d782f Uses squeak component to do this, fixes broken stuff & Travis 2019-01-26 13:21:03 +00:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
datlo
fdc841be8e whole bunch of surgery changes
early cautery not compiling yet
2019-01-26 00:50:18 +00:00
Mike Long
29c9aca1a8 Devil game mode
Fixes more compile errors.  Down to 65 now.

updates << into to_chat

Down to 60 errors, also starts to port the codex gigas and law 666 for cyborg devils.

Fixes more compile errors.  Down to 41 now.

Replaces timers with spawns, and <<s with to_chats
40 compile errors.

Down to 34 compile errors.

whoops, actually down to 34 now.

Down to 25 compile errors.

Down to 15 compile errors, I'llprobably need some help at this point.

Woo!  Down to 7 compile errors.

Ported over devil hud.  Number of errors up to 19.

WOO!  It compiles.  It's completely untested, but it compiles.

Adds devils to traitor panel

Implements iron, silver and salt banes.

implements flashing lights bane

Selling your soul prevents cloning, and some other methods of revival.

Implements harvest bane

Merged and sorted icons/obj/bureaucracy.dmi

Adds toy codex gigas

Fixes compile errors, adds codex gigas sprite.

Lots of bug fixes.  Contracts work, devil revival is more consistant, etc

Adds missing icons for flaming contracts, summon pitchfork, summon wealth, employment cabinet, and sintouch.

Converts DEEP LORE explanations from hell to inferno incorporated.

Banishes the compile errors.

Devils come from hell again.

replaces offer drink obligation with a much more lore appropriate devil's fiddle reference
Also fixes contract bashing brain damage chance.

Undoes some changes I accidentally did to example config files.

Fixes up a few remaining bugs.

Puts in the codex gigas and employment contract cabinets.
 -- Lemon - I kinda skipped this one, I'll patch it back in later because
 map conflicts are suffering incarnate

Solves the devil law problem in a REALLY hacky snowflake way.

Fixes a few methods in which a hellbound can be revived.

Devils respawn with a limited number of appropriate items, instead of COMPLETELY naked upon corpse destruction.  Also adds lines to example config.

Updates devil laws to be less hacky.

Objective to sintouch x mortals now greentexts correctly.

Contracts no longer cause brain damage.  I didn't realize it was lethal on this codebase.  Oops.

Splits dust(visual_only) into dust() and dust_animation() procs

Fixes some defines.
Adds undef statements to improve compile times.

Fixes race changes from demonic form changes.

Fixes small runtime error. (Which somehow didn't break anything?)

Implements lots of small changes/corrections suggested by CrazyLemon64

I still need to test these changes, along with other potential issues he brought up.

Fixes harvest bane and power contracts.  Also adds a few </span> tag enders.

Corrects some edge cases with revival contracts.

Fixes compile error.

Reverts unneccecary change to item/weapon/reagent_containers

Cleans up the code for readability.

Prevents cloning of hellbound individuals.

Latejoins now properly have employment contracts added to employment cabinets (provided they still exist)

Infernal contracts are no longer rendered unreadable by fire and alcohol.

All fireproof paper remains readable after being fireballed, not just infernal contracts.  (Though infernal contracts are the only fireproof paper atm)

Fixes an edge case problem with cloning.

Adds is_revivable proc to mind.

Removes snowflake code involving preventing soulseller resurrection.

Indulges in the sin of sloth, and copies tg's lazy list macros

Proc calls that transform the user no longer go to a null target

Fixes devil UI, human regression will keep appearance, and adds danceoff

Devil's base forms no longer suffocate inside the devil

Fixes runtimes, gets stuff working

The arch devil can now blast down walls with their pitchfork

EXTERMINATE ALL SPIRITS

Activates devil clause in voice of god

Fawks Mcclood

Feature P A R I T Y

Fixes devil bugs from testing

- Does a death refactor to make sure that diabolical resurrection works

- Walls no longer leave girders when blasted by the devil

- Getting a new body gives you a rudimentary amount of equipment to work
with to get out of maintenance or whereever

Does all the icons in a single commit on their own because icon

conflicts suck

Starting point of extra devil rebalance/fixes

Ports devil friends

Also oops tramples all over Fethas' corpse PR that's still up I need
to take care of that one

Styling fixes
2019-01-13 12:00:49 +01:00
void*
8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00
variableundefined
72b237c246 Merge pull request #10530 from datlo/mechvoice
Adds mecha voice modification kits
2019-01-04 20:05:36 +08:00
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist
Ports Move Force from TG
2018-12-28 20:53:07 +08:00
datlo
c12fa7af2b add mech maintenance alert 2018-12-28 07:07:38 +00:00
datlo
c026d533b1 fixed build path error, add power warnings
also put back attacked_by oof
removed syndicate tech requirement cuz eeeh it's just a voice, replaced
by titanium requirement
2018-12-27 20:13:22 +00:00
Mars
e841801717 Remove unneeded check. 2018-12-16 21:17:49 +01:00
Mars
188660b16e Fixes radial implants 2018-12-14 23:01:22 +01:00
Mars
5b78f4719b Radial menu for arm implants. 2018-12-01 13:03:00 +01:00
variableundefined
214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
datlo
65286d7830 Adds the CQC manual to nukie uplinks 2018-11-20 03:51:52 +00:00
variableundefined
5c72537d8c Fixes merge conflicts 2018-11-14 09:21:21 +08:00
Mitchell
29226ea04f Requested Fixes/Further Review 2018-11-11 19:44:35 -06:00
tigercat2000
32c5cb3bbe Merge remote-tracking branch 'upstream/master' into mechastuff
# Conflicts:
#	icons/mob/screen_alert.dmi
2018-11-04 10:52:50 -08:00
variableundefined
7544ae573f Add in squeak component and refactor mouse, bikehorn, clown suit to use it. 2018-11-04 14:17:45 +08:00
variableundefined
ca43b7f29a Merge pull request #10031 from Certhic/nymphs-gui
diona nymphs fixes and hud
2018-11-03 18:20:47 +08:00
Certhic
6381d15525 action buttons 2018-11-03 10:57:19 +01:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
tigercat2000
b370858fc8 Fixes Phazon movespeed, add radial menus to ctrl
Ctrl Clicking on a mech while you're in it will now bring up a radial
weapon selection
2018-11-02 00:46:08 -07:00
Certhic
2c0def4a82 button-iy 2018-10-31 20:01:45 +01:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
Certhic
e9f6f4d803 fixes 2018-10-29 16:14:50 +01:00
Certhic
80a341d6a7 nympphs fixes and gui 2018-10-28 15:10:43 +01:00
tigercat2000
64ea56f025 Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND
# Conflicts:
#	paradise.dme
2018-10-24 23:43:25 -07:00
tigercat2000
13a095ec4a Fix atom init again 2018-10-23 18:48:56 -07:00
tigercat2000
8ef1b97f45 Merge remote-tracking branch 'upstream/master' into multivis
# Conflicts:
#	.travis.yml
#	_maps/map_files/MetaStation/z2.dmm
#	_maps/map_files/cyberiad/z2.dmm
#	code/game/atoms_movable.dm
#	code/game/machinery/camera/camera.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/ai/freelook/eye.dm
2018-10-23 17:41:41 -07:00
tigercat2000
720bc1da8b Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND 2018-10-21 11:46:39 -07:00
variableundefined
e42adaa276 Fix 2018-10-21 21:59:43 +08:00
tigercat2000
4d17f14de0 Radial Menu Port & RCD Refactor-Upgrade
This commit ports tgstation/tgstation#39991 and parts of
tgstation/tgstation#40350.

Primary changes:
 - A radial menu system has been introduced, which can contain any
 arbitrary sprite and be applied to any arbitrary object.
 - RCDs take advantage of this radial menu system; Using them in-hand
 will no longer directly bring up the UI, but instead, will bring up a
 radial menu that can directly change between modes (as well as access
 the old UI)
2018-10-20 22:59:39 -07:00
variableundefined
d4376fff69 Fixes conflict and screen object breaking 2018-10-21 08:31:46 +08:00
variableundefined
d67059102e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RelPath 2018-10-20 15:14:12 +08:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
tigercat2000
54f6d54d4c Hover indicator for body zones 2018-10-18 22:19:25 -07:00
alex-gh
2b53ba43cd You can no longer roll around when dead. 2018-10-15 01:21:03 +02:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
tigercat2000
8ce0592ac0 SSOverlays & Hover Inventory Indicator
This ports the hover inventory indicator from /tg/, and by necessity, SSOverlays.
The hover inventory indicator basically shows where you are trying to
put an item, and then shows an item ghost in red or green, giving visual
feedback as to if that item will go in the slot or not.

SSOverlays is a much broader system for managing overlays, which should
eventually take over *all* overlays, but I have only ported the basic
system and implemented it where necessary for it to work for the hover
inventory items currently.
2018-10-08 22:50:39 -07:00