Commit Graph

2327 Commits

Author SHA1 Message Date
Fox-McCloud
21aa0c2aab further tweaks/fixes 2016-08-18 00:19:29 -04:00
Fox-McCloud
1f364c1bcf Kinetic Smasher 2016-08-17 20:31:37 -04:00
TheDZD
0a8b81ff7a Merge pull request #5412 from FalseIncarnate/wololo
Wololo
2016-08-17 17:26:10 -04:00
TullyBurnalot
9634181318 Janitorial Quality of Life Update (#5239)
* Janitorial Quality of Life

- Trash Bags fit in satchels/bags/duffelbags
- Advanced Mops clean faster, can clean more
- Holosign Projectors can create more signs
- New Closet added, with janitorial stuff that was previously on the
ground
- Ghosts can no longer create dirt
- Dirt creation slowed down
- Janitorial Closet tidied up

* Removes redundant check

* Trash Bags become heavier with use

* Fixes Map Merge not being done

* Re-adds Box Refilling because I am an idiot

Missing parenthesis, not even ONCE

* Unblocks MULEbot docking area

* Adds broken bulb recycling

* Addresses Fox's/DZD's concerns

* Adds sanity checks for NODROP
2016-08-17 17:23:19 -04:00
Kyep
22857fcab4 Adds Syndicate Infiltration Team (#4816)
* Adds Syndicate Infiltration Team

Goals:
- Provide a way to introduce a group of co-operating traitors, e.g: for
events.
- Provide a way to draw several ghosts into the round at once.
- Provide a way to enable additional objectives (e.g: kidnap) traitors
don't currently have a way to complete.
- Provide an evil counterpart to the Emergency Response Team.

Main:
- Creates a new "Send Infiltration Team" verb under Secrets -> IC for
admins. This verb creates a team of syndicate infiltrators, drawn from
ghosts.
- The infiltrators themselves are prespawned with stealth items
(including 20 TC uplink implants, dust implants, chameleon jumpsuit,
etc).
- The admin who invokes the SIT chooses their mission. It can be
anything.
- This team has their own shuttle, with 3 docking points on the
Cyberiad: arrivals maint, eng maint, and sci maint.
- Their shuttle has blast doors, and a small shuttle brig for abducting
Cyberiad crew.

Misc:
- Creates an 'emag_immune' attribute for doors (and pod doors). Applies
it to SST, SIT and nuke ops main doors. SST application prevents an
exploit. SIT/nukeops application prevents failzerg.

* check_rights, color codes

* Improved Options

- Added PDA painter to SIT spawn room, to prevent SIT members from
metagaming the SIT by identifying them from their PDA color.
- Added food, drinks, and laundry machine/crayons (to recolor gloves) to
the SIT spawn room.
- Added team size prompt for issuing admin, to allow them to send larger
or smaller teams.
- Removed storage implant from the list of things SIT team members spawn
with. In most cases, they will have plenty of TC to buy one if they want
it.
- Fixed action button sprite on dust implant. No longer displays as
blank.
- Added the number of TC each team member gets on spawn as an
admin-configurable option when using the verb. 20-30 is suggested.
- Updated memories ("Notes") given to each SIT member upon creation.
- Fixed a bug with SIT team size which was sometimes causing one less
person to spawn than was intended.

* Minor Improvements

- Made SIT members show up on antaghud, and to each other. Rather like
nuke ops.
- Made SIT members start out with a flashlight in their backpack, so
they can more easily find their way into the station from maint, without
bumbling around in the dark.
- Removed manhack grenade from SIT shuttle, replaced it with a welding
tool. Subtle hint to break the wall into the station.
- Added option for admins to spawn a Syndicate Officer to brief the team
before they go. The officer does not go with the team. They're rather
like ERT Directors briefing ERTs before they are sent out. Optional
fluff.

* Map Area Tweak

* Fixes potential SST exploit with c4-ing mech door

* Tiger

* World's smallest merge/Travis fix

* Renames Officer to Management Consultant

* Removes protected var blocking C4 on poddoors

* Removes emag_immune property for doors
2016-08-17 17:21:51 -04:00
Mieszko Jędrzejczak
a0959a742f Why must thou abandon me, src? 2016-08-17 22:06:51 +02:00
Mieszko Jędrzejczak
cb33fdc79e Goshdurn hoodies 2016-08-17 20:05:05 +02:00
FalseIncarnate
4ea4f52883 wololo 2016-08-15 00:15:15 -04:00
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
FalseIncarnate
03fafac9d9 WOLOLO Cleanup v2
Moves the timer (and deconversion) to the mind datum instead of on the
staff.

Rewrites nullrod reskin list-building to instead rely on a variable set
on the subtype of nullrod to determine whether or not to include it by
default.
- By default, all nullrod subtypes EXCEPT fluff subtypes and the
missionary_staff subtype have this set to TRUE.
- Fluff subtypes still re-add themselves to the list as appropriate
through their fluff_transformations list entries, like they previously
did.
- This also allows future coders to potentially make new nullrod
variants that are not reskin options (such as for admin-only versions,
or special away mission reward versions) with better stats / effects by
simply setting "reskin_selectable = FALSE" in the subtype declaration
instead of manually removing the path from the list
2016-08-14 01:02:23 -04:00
FalseIncarnate
8d15e683a6 WOLOLO cleanup
Cleans up those nasty trailing returns, colons, and other clutter. Also
went ahead and removed the colons from the original mindslave code I
copied.

Converting loyalty implanted crew now results in a shorter zealot
duration. Previously, all crew was a zealot for 10 minutes, now crew
that is loyalty implanted AT THE TIME OF CONVERSION remains a zealot for
only 5 minutes before deconverting.
2016-08-12 21:29:18 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
FalseIncarnate
8028695077 WOLOLO AEOOEO 2016-08-10 23:40:02 -04:00
Fox-McCloud
0b23e2a497 Fixes Bandolier Sprite 2016-08-10 18:57:35 -04:00
TheDZD
6d280e52de Merge pull request #5375 from Fox-McCloud/formal-captain
Formal Captain Update
2016-08-10 18:12:09 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
2016-08-10 14:16:42 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
FalseIncarnate
20b33bcb1f WOLOLO
New traitor chaplain items: Missionary Robe and Missionary Staff.

They look like ordinary chaplain hoodies, but the Missionary Robes
actually are armored and can be linked to a single Missionary Staff to
recharge "faith" while wearing the robes.

The Missionary Staff looks like either the red or blue godstaff
nullrods, and is also a nullrod (can't be reskinned). However, the true
power comes when linked to a set of Missionary Robes, charging the staff
with "faith" that can be used to perform ranged conversions on
individual targets within sight of the missionary.

Conversions mimic the effects of a mindslave implant, except that it
only last for 10 minutes before the victim returns to normal. The victim
is specifically told when they deconvert that they forget their actions
and master. Conversion is able to overcome loyalty implants sometimes,
but if successful it will take longer than normal to recharge. Likewise,
the more "educated" crew members (psychiatrist and librarian) are more
resistant to conversion, though much less so than the loyalty implanted
crew (these resistances do not stack). Civilians, on the other hand,
have a chance to only use half the "faith" of a normal conversion,
meaning you can attempt another conversion much sooner. Crew that is
already mindslaved (whether by a staff or implant) cannot be converted,
as they are already mentally dominated, so this can also potentially
help you make a new traitor friend if you play your cards right.

Successfully converting a crew member mindslaves them to you for 10
minutes, and recolors their worn jumpsuit to match the color of your
staff (red or blue, chosen randomly when the staff is spawned). Failure
to convert a target expends 25-75 "faith" (based on circumstances),
while a successful conversion typically uses 100 "faith" but can use
more or less in special cases. As long as you wear the Missionary Robes
and keep your Missionary Staff close by, the "faith" recharges passively
and will notify you when you are able to attempt another conversion.

Times, chances, and values are subject to change.

TODO: Upon conversion, play "WOLOLO" to the missionary and new zealot,
to inform them both of the good news. Also, testing.
2016-08-10 06:39:13 -04:00
Fox-McCloud
11155b261a Merge remote-tracking branch 'upstream/master' into formal-captain 2016-08-09 05:14:39 -04:00
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update
Malf AI Powers Update
2016-08-08 21:30:12 -04:00
Fox-McCloud
0694a35da4 Formal Captain Update 2016-08-08 19:01:37 -04:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Conflicts:
	code/game/gamemodes/objective.dm
2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
Fox-McCloud
aa1e0407d4 Illusion Simple Animals Have Attack Sounds 2016-08-08 00:20:13 -04:00
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -04:00
Ty-Omaha
1b03ac78fd Fix 2016-08-04 19:20:19 -04:00
Chakirski
6dca3112b3 The fact this is inconsistent hurts me. 2016-08-04 11:29:26 -05:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Fox-McCloud
bb30a02dd5 Better Destroys 2016-08-02 23:59:23 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
2016-08-01 21:29:19 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZD
bc98945c7a Merge pull request #5177 from Fox-McCloud/medical-stack-rework
Trauma and Burn Kit Rework
2016-08-01 21:03:07 -04:00
TheDZD
8e9850d76a Merge pull request #5222 from Crazylemon64/json_serialization2
Lets you convert people to text and back again
2016-08-01 20:55:08 -04:00
Fox McCloud
f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox
Refactor stack recipes
2016-08-01 20:44:37 -04:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Fox McCloud
31ad2a84f2 Merge pull request #5132 from Kyep/atmos_grenades
Atmos Grenades (aka: how to kill people with atmos)
2016-07-31 22:40:03 -04:00
Crazylemon64
291fac97a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2 2016-07-31 12:41:32 -07:00
Fox McCloud
4c40a74746 Merge pull request #5254 from Crazylemon64/space_allocation
Updates space transitions and integrates it with the space management module
2016-07-31 12:18:19 -04:00
Tigercat2000
221476ef3b Refactor stack recipes
- Styling fixes
 - Added post_build() to stack recipes, for any recipes that need to do
   something special
   - Called with two arguments, the stack that it originated from, and the
     new object.
 - Moved stack recipes to their own file

Currently, only two things use post_build
 - Cablecuffs use it to color the cuffs the same as the wire they
   originated from
 - Metal rods use it to call update_icon, in order to display the correct
   sprite for whatever amount of rods you created.
2016-07-31 07:20:26 -07:00
Fox McCloud
13ba6b6429 Merge pull request #5255 from IcyV/Electric-Axe-2--Electric-Boogaloo
Gives Atmos-Traitors a new fireaxe.
2016-07-31 00:48:06 -04:00
IcyV
da360c8703 Gives Atmos-Traitors a new fireaxe.
Give Atmos-traitors a unique 10TC axe to buy.

This axe starts with a single charge and can gain more charges over time
by destroying windows and grilles. Each grille or window destroyed has a
4% chance of giving another charge to the axe. On a charged hit the axe
will hit for 30 brute and 30 burn. It will otherwise function as a
normal fireaxe if out of charges.

![nknwxga](https://cloud.githubusercontent.com/assets/6348574/17047510/9ab3c986-4f93-11e6-83b8-c3e4598704eb.gif)

Sprites courtesy of Fullofskittles
🆑 IcyV
add: Adds a unique axe for Atmos-traitors
/🆑
2016-07-29 21:08:50 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Taylor Wood
869c13e493 Fixes exploding backpacks 2016-07-29 23:05:59 +01:00
Fox-McCloud
731600a21f tweaks 2016-07-29 17:07:25 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Kyep
4f01a05ae6 Changed Indentation 2016-07-28 22:03:55 -07:00
TheDZD
3061214620 Merge pull request #5205 from Fox-McCloud/librarian-qol
Librarian QoL---Bookbag
2016-07-28 15:12:46 -04:00
Crazylemon64
11707edff8 Now with less "t" 2016-07-27 22:49:45 -07:00
Crazylemon64
7719b58cf0 Improves serialization: Now with clothes (tm) 2016-07-27 22:26:40 -07:00