Commit Graph

198 Commits

Author SHA1 Message Date
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +02:00
Fox McCloud
d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
AffectedArc07
13c26d716c Uses a list instead of world search 2019-03-09 10:31:36 +00:00
variableundefined
459228a81c Merge pull request #10836 from datlo/navconsoles2
Revives Shuttle Navigation Computers to all syndicate shuttles + Vox/ERT
2019-02-27 22:26:08 +08:00
Citinited
843a41622d Adds jestosterone to standard reagents list 2019-02-13 18:43:13 +00:00
datlo
c57ec440e1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2
# Conflicts:
#	code/modules/shuttle/shuttle.dm
2019-02-11 13:31:37 +00:00
datlo
91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
datlo
0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo
cf1a95dabc fix config options 2019-02-04 00:21:13 +00:00
datlo
f98da3edf8 Progress... 2019-02-02 17:51:25 +00:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05: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
datlo
61c0f71cce Replaces uplink management by automated sharing
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
variableundefined
e5680badc4 Merge pull request #9902 from alex-gh/anonymous_syndieradio
[READY] Syndicate communication channel is now pseudonymous.
2018-10-26 18:59:56 +08:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
alex-gh
6a4d878940 Makes syndicate comm channel pseudonymous. 2018-10-19 14:34:47 +02:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Desolate
7d78fe93bf Refactors some reagent lists into global list
Fixes an oversight with fly amanita from the BAYBOTANY to TGBOTANY change.
2018-09-27 20:44:25 -05:00
FalseIncarnate
8c6685f1b0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-08-16 00:16:32 -04:00
Fox McCloud
4f10f52c7e tweaks 2018-07-27 14:51:04 -04:00
Fox McCloud
ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Fox McCloud
6092e0319f name and further fixes 2018-07-19 02:04:03 -04:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor
RPD refactor
2018-07-16 14:22:38 -07:00
Fox McCloud
ef23639921 Merge pull request #8875 from Citinited/put-that-cookie-down
Adds random fortunes to fortune cookies
2018-07-11 13:55:28 -04:00
Citinited
14ba039d81 GLOB 2018-05-30 21:47:03 +01:00
Citinited
2ec3c797fd RPD refactor: part 2 2018-05-30 21:47:03 +01:00
FalseIncarnate
9af6eb086f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-05-25 22:42:41 -04:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
FalseIncarnate
7b823195e5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-24 22:09:33 -04:00
tigercat2000
8c1e61f63f Adds the aurora caelus event, the space equivelent of the northern lights. 2018-04-22 21:10:45 -07:00
FalseIncarnate
36dec344fa Merge conflict fix 2018-04-20 02:04:01 -04:00
Citinited
5f4b2eef0a More fortunes 2018-04-15 16:40:55 +01:00
Citinited
b66c700a63 tigercat & falseincarnate code suggestions 2018-04-14 16:40:25 +01:00
Citinited
1c8740ca93 Merge branch 'master' into put-that-cookie-down 2018-04-14 01:21:24 +01:00
Citinited
b60eb67202 Adds fortunes to fortune cookies 2018-04-14 01:06:11 +01:00
tigercat2000
57a4be2138 Merge pull request #8794 from Birdtalon/fixes
Fixes and tweaks
2018-04-06 20:02:07 -07:00
Birdtalon
886b2ad8d9 nanocalcium reagent restriction 2018-03-23 17:35:15 +00:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00