Commit Graph

1915 Commits

Author SHA1 Message Date
Fox McCloud
656b4285a0 Merge pull request #6698 from Kyep/gateway_listeningpost
Converts "Listening Post" away mission into a space ruin
2017-03-26 19:07:36 -04:00
FlattestGuitar
4445a34650 Merge branch 'master' into outfiterinos 2017-03-25 21:20:51 +01:00
FlattestGuitar
c0ac235704 Touching up the admin outfits... 2017-03-25 18:45:36 +01:00
Crazylemon64
36ec603a51 Rod form is now half-speed, and has a warning sound 2017-03-22 10:30:24 -07:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam
3af44d2a08 More typos fixed... 2017-03-19 05:13:20 +00:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04: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
davipatury
781e66ec52 Fix conflicts. 2017-03-08 12:57:45 -03:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Kyep
48cde247b0 Adds listening post space ruin
http://i.imgur.com/Z6OEBNp.png
2017-03-08 00:02:57 -08:00
Fox McCloud
f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Fox-McCloud
41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie
960b1206bd Fix wire path 2017-03-05 23:36:18 +01:00
Markolie
9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01:00
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
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03: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
davipatury
302acdc444 Card Mod, Power Monitor and Console Presets. 2017-02-20 19:38:23 -03: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