Commit Graph

25091 Commits

Author SHA1 Message Date
FalseIncarnate
6c45afa492 Blaming Java
Accidentally included end-of-line semi-colons. Blaming Java experience.
2017-03-27 11:16:43 -04:00
FalseIncarnate
57eadb3a0e Removes real_name restriction for silicon sprites
Also adds code support for custom maint drones.  Whether or not we want
to let people get custom drone sprites is up to the head admins, but the
code is there for it. Maint drones have a new verb which attempts to
equip their custom sprite, if one exists for that player, which can only
be used once.
2017-03-18 01:37:50 -04:00
FalseIncarnate
56b52d8c64 Fixes issue with invisible inventory-sprite for LUNE
Also moved the custom synthetic sprites into their own subfolder of the
mob icons folder.

Created 3 new dmi files to support left and right inhands as well as
head on-mob sprites for custom synthetics, moving the states from
custom-synthetic.dmi into their new files as appropriate. Yes, this
kinda splits them up a bit, but thats why i made the folder!
2017-03-15 23:17:37 -04:00
FalseIncarnate
5a4ac30071 FullofSkittles Custom pAI & Silicon Fluff Tweaks
Adds in FullofSkittles's custom pAI

Adds support for custom pAI sprites

Tweaks code for custom cyborg, AI, and hologram sprites to be more
standardized, which made adding pAI support that much easier. I guess
this could also be extended later on if we wanted to support custom
maint drone sprites...

As a result of the changes, the custom_sprites.txt file will need to be
updated to the new standardized format (been working with Alffd on that
anyways so he's aware). I have taken the liberty of updating the example
custom_sprites.txt to explain and match this new format for our
downstreams and other coders.

🆑
rscadd: Adds FullofSkittles's custom pAI sprites. Thanks FoS!
/🆑
2017-03-15 21:34:49 -04:00
Fox McCloud
0103f297bb Merge pull request #6741 from uraniummeltdown/supplytalisman
Adds 5 Runed Metal to Supply Talisman
2017-03-14 06:35:34 -04:00
Crazy Lemon
fde675b2ad Merge pull request #6737 from uraniummeltdown/crowbartiles
Quick Tile Replacement
2017-03-13 13:35:51 -07:00
Crazy Lemon
b7610a66a9 Merge pull request #6742 from Kyep/phazon_fix
Fixes #5694 - Phazons not phasing, toxic injector being broken
2017-03-13 13:29:58 -07:00
Crazy Lemon
4edee61021 Merge pull request #6739 from Kyep/gateway_wildwest_mines
Stops Wild West syndie mobs killing themselves with their own mines
2017-03-13 13:14:34 -07:00
uraniummeltdown
49910617f3 crowbar/screwdriver(wood) in inactive hand, attack floor with tile to replace quickly 2017-03-12 17:26:07 +04:00
Fox McCloud
80430ffe3c Merge pull request #6727 from Crazylemon64/kudzu_spread_nerf
Kudzu Rebalance
2017-03-12 04:10:59 -04:00
Fox McCloud
1a23c8a199 Merge pull request #6746 from Markolie/zefix
Fixes
2017-03-12 03:42:06 -04:00
Fox McCloud
7b47e6b52b Merge pull request #6736 from Jovaniph/vulpevasuit
Adds Vulpkanin EVA suit sprite
2017-03-12 03:40:48 -04:00
Fox McCloud
0fe2a135e4 Merge pull request #6728 from FlattestGuitar/click
Adds clicks to flashlights 🔦
2017-03-11 21:26:23 -05:00
Jovan
65cb35fbb2 please no merge conflict. 2017-03-11 19:21:06 -05:00
Crazy Lemon
9de6d25f07 Merge pull request #6696 from davipatury/hallo-2
Hallucinations 2.0
2017-03-11 15:33:47 -08:00
Crazy Lemon
661939c145 Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Crazy Lemon
175a4475f0 Merge pull request #6676 from KasparoVy/TailMarkingFix
Fixes a Bug With Tail Markings
2017-03-11 15:27:57 -08:00
Crazy Lemon
a5f594ce37 Merge pull request #6689 from Fox-McCloud/nerf-shotguns
Nerfs Buckshot
2017-03-11 15:26:58 -08:00
Jovan
48caf853d5 forgot other file yaya 2017-03-11 16:51:04 -05:00
Jovan
54ee658a94 mesies fix voxy stuff, yaya? 2017-03-11 16:50:13 -05:00
Jovan
f1188c0ecc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise.git into vulpevasuit 2017-03-11 16:45:02 -05:00
Markolie
255a6a1c17 Set poll time of cult demon to 100 2017-03-11 18:26:04 +01:00
Markolie
5c20a29b1d Fix statue welding, fix firedoor message spam, fix slaughter candidate pick 2017-03-11 18:25:23 +01:00
Kyep
14d0c0da7a Fixes #5694 - Phazons not phasing, toxic injector being broken
🆑 Kyep
fix: Phazons' phase ability now works again.
fix: Phazons' toxin injector melee damage type (a weak melee attack) now
works again.
/🆑
2017-03-11 04:42:31 -08:00
uraniummeltdown
33548720eb adds 5 runed metal to strong supply talisman 2017-03-11 15:36:47 +04:00
Kyep
b6b1b3c0aa Stops Wild West syndie mobs blowing themselves up on their own mines
🆑 Kyep
fix: Syndicate mobs in the Wild West are no longer so stupid that they
trip over, and die to, their own mines.
/🆑
2017-03-11 02:11:33 -08:00
Jovan
22db913d9f conflict fixing. 2017-03-11 05:08:19 -05:00
Jovan
054a4ce3f1 Merge Fix? 2017-03-11 05:05:49 -05:00
Fox McCloud
3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
Fox McCloud
d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Fox McCloud
654840ddfd Merge pull request #6719 from uraniummeltdown/cawcaw
Removes Vox EVA suits
2017-03-11 04:44:44 -05:00
Fox McCloud
4e76b226f9 Merge pull request #6721 from Markolie/firelockdoorclose
Minor firelock/airlock force change and firelock explosion change
2017-03-11 04:43:16 -05:00
Fox McCloud
e4dacf2296 Merge pull request #6732 from Krausus/CanYouHearTheBwoink
Fixes Admin Bwoink Preference
2017-03-11 04:41:00 -05:00
Jovan
19a44e7172 added vulpkanin eva suit 2017-03-11 02:09:16 -05:00
uraniummeltdown
04368ef0c5 removes Vox EVA suits, adds sprite_sheets and sprite_sheets_obj to regular EVA suits, added 2 more EVA suits to map in place of Vox ones 2017-03-11 10:39:56 +04:00
Krausus
a803500489 Fixes admin bwoink preference
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
2017-03-10 19:46:35 -05:00
uraniummeltdown
9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
FlattestGuitar
8c9b1ab043 Adds clicks to flashlights 2017-03-10 17:21:09 +01:00
Crazylemon64
25cde1f8e8 Reverts rwall change, reworks aggressive spread instead 2017-03-10 04:56:10 -08:00
Crazylemon64
577bf23226 Max-power kudzu should be less station-eating
Rwalls now resist weak explosions - allowing them to resist aggressive
vines perfectly
Bluespace vines lose their "potential energy" after piercing through a
single tile, so as to not allow station-engulfing monstrosities to grow
unchecked
Vines no longer normally spread on space tiles - this is now reserved for
space covering vines (and bluespace in seldom occasions) only

Makes kudzu events kick off more interestingly
2017-03-10 04:42:27 -08:00
Markolie
0bc0a2c461 All types of crystals 2017-03-10 12:45:47 +01:00
Markolie
cf4f350a79 Let matter grippers carry firelock electronics and bluespace crystals 2017-03-10 12:44:37 +01:00
Markolie
a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm
2017-03-10 12:42:37 +01:00
uraniummeltdown
dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Fox McCloud
7c7a2c01c5 Merge pull request #6714 from Jovaniph/recitencesound
Recitence mech makes no sound when turning
2017-03-10 01:53:57 -05:00
Fox McCloud
d7d1e42cc2 Merge pull request #6678 from LordJike/carrot-tweaks
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
2017-03-09 21:36:40 -05:00
Fox McCloud
9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Fox McCloud
bbdf2fb05a Merge pull request #6713 from Luthix/toxlaunch
Fix toxins launch room
2017-03-09 21:26:43 -05:00
Markolie
2b83c08e29 Remove severity 3 damage 2017-03-09 18:50:52 +01:00
Markolie
9cd0d490f9 Add explosion damage to regular firelocks 2017-03-09 18:49:15 +01:00