Commit Graph

1894 Commits

Author SHA1 Message Date
Markolie d877ef1de3 Fixes 2017-03-05 20:14:06 +01:00
Markolie 9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Fox McCloud 15cda911f4 Merge pull request #6668 from Kyep/objective_announce
Makes objective changes more obvious
2017-03-05 03:06:55 -05:00
Fox McCloud f18ae48808 Merge pull request #6655 from Kyep/poison_pen
Poison Pen, QM/HoP/CargoTech Traitor Item
2017-03-05 02:36:45 -05:00
Kyep 18eb3fa4e0 Cost: 5->2 TC, Reagent:Sarin->Amanitin 2017-03-04 22:50:20 -08:00
Crazy Lemon 0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
davipatury 3a10ee852a Crazylemon's suggestion. 2017-03-04 14:17:57 -03:00
Kyep f2bd748a11 Adds alarm sound to objective changes
🆑
tweak: Antags whose objectives are manually announced by an admin, or
altered automatically as a result of their target cryoing, will now hear
a warning sound. The sound is the same as the 'crew transfer vote
called' sound. Additionally, the text notice for changed objectives is
more obvious.
/🆑
2017-03-02 22:48:46 -08:00
Kyep 04543d1466 Initial version, from TG
Ports Poison Pen from TG:
https://github.com/tgstation/tgstation/pull/23778
Adds a HoP/Cargotech/QM-only traitor pen that can be used on paper to
poison it.
Picking up poisoned paper without gloves transfers the poison through
your skin, into your bloodstream. Subsequent people to pick it up are
not affected.
The poison is 15 units of the nerve agent, sarin. This is enough to kill
you in a couple of minutes. It is quite obvious.
The pen looks like a normal pen, costs 5 TC, and has 3 uses. It cannot
be used as a direct weapon. It has to be applied to paper to be
effective.

🆑 Kyep
rscadd: Added Poison Pen, a stealthy way of applying a contact-based
poison to paper. Available to Syndicate HoPs, QMs, and Cargo Techs.
/🆑
2017-03-01 23:44:31 -08:00
Sam a59cc3c15f adds wood planks to Cargo ordering
Only 30, and 15 points, which is more expensive than metal. Wood in
space is rare!
2017-02-27 12:37:18 +00:00
davipatury bf45dd3cad Updates holder ui when pulsed/cut. 2017-02-26 15:23:56 -03:00
Crazy Lemon e6e3ebd462 Merge pull request #6599 from davipatury/datacore-effect
Refactors datacore into a datum
2017-02-26 09:38:56 -08:00
Crazy Lemon 186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
davipatury 97b9e17955 Datacore refactor. 2017-02-25 22:31:19 -03:00
davipatury a3a1775696 Wires nano-ui. 2017-02-25 21:51:28 -03:00
Fox McCloud 1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Tigercat2000 fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Fox McCloud 8b1a53b2d0 Merge pull request #6536 from SamHPurp/dethroning
Moves crown to cargo crate
2017-02-24 14:54:12 -05:00
KasparoVy 3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
KasparoVy 4bb1c57d7e Conflict resolution
Unironically conflicting with another one of my PRs
2017-02-23 17:26:22 -05:00
Krausus 3a5ef1baea Makes disease square roots bottom out at 0 2017-02-23 05:43:21 -05:00
KasparoVy 9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
Crazylemon64 69ece3d12e Makes autolathe hacking work again 2017-02-21 02:19:00 -08:00
Sam d3e3ed24a4 Dethrones captain, adds crown to hat crate
Removes crown from Captain locker & adds to collectible hat crate
2017-02-20 12:53:12 +00:00
Tigercat2000 e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
Tigercat2000 14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08:00
Mark van Alphen dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
uraniummeltdown af937077cd cooldown 25->60 upgraded 10->20 2017-02-15 16:09:51 +04:00
uraniummeltdown c661609076 Merge remote-tracking branch 'remotes/upstream/master' into rodform
# Conflicts:
#	icons/mob/actions.dmi
2017-02-15 15:56:36 +04:00
Crazy Lemon 77a98d9a21 Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
KasparoVy 87aa937d8d Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
Crazy Lemon ebe28b3372 Merge pull request #6425 from Markolie/stackprogressbars
Progress bars now stack vertically
2017-02-14 13:27:47 -08:00
uraniummeltdown 60e61db55f ports rod form wizard spell from tgstation 2017-02-14 21:05:08 +04:00
Fox McCloud 300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Markolie c570ec4db2 Fix if() space 2017-02-13 00:02:33 +01:00
Markolie 40740d18ba Code cleanup 2017-02-12 23:54:53 +01:00
Markolie d0247fff2c Progress bars now stack vertically. Also adds a bunch of lazy list helpers. 2017-02-12 23:51:50 +01:00
KasparoVy 6b50f16a12 Fixes Vox-tail Bug
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
2017-02-12 02:28:15 -05:00
Markolie 4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
Markolie 3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Crazy Lemon 2d77a0ab4d Merge pull request #6357 from Fox-McCloud/var-edit-fixes
On Varedit Fixes
2017-02-07 20:01:32 -08:00
Crazy Lemon d11dfa7a3b Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-07 19:58:28 -08:00
Crazy Lemon 685250501b Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
Monkey cube refactor
2017-02-07 19:53:58 -08:00
Markolie 835f68843a Minor fixes, prevent ABSTRACT items from being summoned 2017-02-07 23:54:50 +01:00
Mark van Alphen 42cd3eec9a Merge branch 'master' into stationgoals 2017-02-07 18:51:08 +01:00
Fox McCloud 93df42e792 Merge pull request #6342 from uraniummeltdown/clingmemory
Changeling Absorb Memory Fix
2017-02-07 09:21:32 -05:00
Fox McCloud 6b10c515b1 Merge pull request #6341 from uraniummeltdown/crates
Engineering and Science crates
2017-02-07 09:20:57 -05:00
Fox-McCloud ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
Fox McCloud fb926cb0d4 Merge pull request #6328 from uraniummeltdown/linglink
Hivemind Link
2017-02-06 07:26:20 -05:00