Commit Graph

1256 Commits

Author SHA1 Message Date
taukausanake
b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
	code/game/objects/items/devices/flashlight.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm

 Changes to be committed:
	modified:   code/game/gamemodes/shadowling/shadowling_abilities.dm
	modified:   code/game/machinery/computer/computer.dm
	modified:   code/game/machinery/floodlight.dm
	modified:   code/game/objects/items/devices/flashlight.dm
	modified:   code/game/objects/items/devices/paicard.dm
	modified:   code/modules/clothing/head/hardhat.dm
	modified:   code/modules/clothing/spacesuits/hardsuit.dm
	modified:   code/modules/clothing/spacesuits/plasmamen.dm
	modified:   code/modules/lighting/lighting_atom.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/pai/pai.dm
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/pda/PDA.dm
	modified:   code/modules/power/lighting.dm
	modified:   code/modules/projectiles/gun.dm
2019-02-02 22:53:46 -06:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Diegoflores31
ec630e9fee Update Crossbow.Dm
A little bit more damage to the makeshift bolt than before 

Before 8 ==> now 10 (like floor tile)
2019-01-27 01:35:26 -05:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05: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
variableundefined
0b8ce92516 Merge pull request #10652 from AzuleUtama/syndieBundleRework
Syndicate Bundles - Increased overall value and added a new bundle
2019-01-18 18:04:59 +08:00
variableundefined
1b6022ac93 Merge pull request #10632 from Kyep/trader_tweaks_2
Sol Trader Updates 2
2019-01-14 21:35:47 +08: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
Kyep
520d880140 makes 9mm rubber ammo clip say its rubber 2019-01-10 15:20:08 -08:00
Kyep
61e888cd2b adjusts experimental KA 2019-01-10 14:40:24 -08:00
AzuleUtama
25ee0ddade Syndie Bundle Rework 2019-01-10 19:23:47 +00:00
Aurorablade
3aa3c942d1 FiXes CaPs
Makes the claiber type match the ammo type so it loads correctly in cap guns
2019-01-10 01:21:11 -05:00
variableundefined
a1f9a19fe2 Merge pull request #10557 from datlo/clownwiz
Adds the Staff of Slipping and Clown wizard outfit
2019-01-09 17:59:08 +08:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
18881b2592 Merge pull request #10595 from AzuleUtama/caneDartChange
Mime's Cane Shotgun ammo reworked and buffed
2019-01-06 16:19:15 +08:00
AzuleUtama
fb052938c8 Cane shotgun darts more effective + other changes 2019-01-05 01:41:39 +00:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
datlo
040cb89ff4 change hitsound to bike horn 2019-01-01 21:58:17 +00:00
datlo
c37b22c00b replace placeholder sprite
oops
2019-01-01 21:23:41 +00:00
datlo
7294ce4584 Removed hitsound, added wizzclown specie sprites 2018-12-30 19:06:57 +00:00
datlo
5b92bdd66d Add staff of slipping (placeholder sprites) 2018-12-30 16:54:16 +00:00
joep van der velden
1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefined
07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD
Trying to Diagnose rsc issues
2018-12-12 13:28:55 +08:00
AzuleUtama
8284c56c54 Fixes bulldog and c20's low ammo alarms only going off once 2018-12-12 00:28:45 +00:00
Aurorablade
87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
lass9030
b4914464d7 action icon 2018-12-09 15:08:29 +01:00
Granodd
c33f03b920 Removes casing sound from removing chambered round 2018-12-04 13:00:30 -05:00
Granodd
b33eebfc3f keeping the code consistent (forgot a return) 2018-12-02 21:22:54 -05:00
Granodd
8fb45039c0 moved attackby proc to projectiles/guns/projectile.dm 2018-12-02 21:10:20 -05:00
Granodd
0a84835c84 removes some unneeded code for a future PR 2018-12-02 04:38:26 -05:00
Granodd
9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
datlo
2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
variableundefined
d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob
Adds/ports modified reflective blobs
2018-11-24 08:28:37 +08:00
Ty-Omaha
cb8bc0f34d reflector blobs 2018-11-23 11:19:55 -05:00
AzuleUtama
ff92a43bcf cleaned it up a bit 2018-11-23 10:45:37 +00:00
AzuleUtama
4bea51027b Overall fix for projectile falloff
Aims to fix the overall issue of damageless projectiles not working under the new falloff code.  Also fixed some weird indentation in the original version of the range() code.
2018-11-23 10:23:38 +00:00
datlo
a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
AzuleUtama
0332e946f6 Made laser tag guns work again
dear god what have i done
2018-11-22 01:25:16 +00:00
Ty-Omaha
2ce52aa2fe ricochet and stuff 2018-11-21 10:50:45 -05:00
TDSSS
92991726ec Moved silencers, gave them their own folder 2018-11-19 09:52:25 +01:00
Gwydion Brain
f3eaed5606 woop woop woop 2018-11-15 19:18:50 -08:00
AzuleUtama
0c59000df1 made stamina dropoff check actually work - cleaned up code
Based on reviewer's comments.
2018-11-15 09:06:19 +00:00
AzuleUtama
b790261d8d Quick change to tile_dropoff if statement should there be no dropoff 2018-11-14 22:10:56 +00:00
AzuleUtama
e2c81535f0 X-ray laser nerf - Falloff and Charge
See here for the main reasoning behind the PR -
https://nanotrasen.se/forum/topic/14790-wanted-unwanted-features-refactors-bugfixes-thread/
2018-11-14 21:12:52 +00:00
Citinited
b07af660ed Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500, 2018-11-09 23:18:54 +00:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00