cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 16:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,594 Commits 26 Branches 2 Tags
5a56b44c007a04cf4e793129dd461bedc4e6f1ac
Commit Graph

1924 Commits

Author SHA1 Message Date
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull 
Converts Most Destroys to use QDEL_NULL
 2017-04-05 23:49:19 -07:00
Fox McCloud
4ad7cd17fd Merge pull request #7043 from SamHPurp/assorted-fixes 
Fixes
 2017-04-05 19:15:12 -04:00
Twinmold
11c9c8d10b Fixes Poison Pen 
Fixes not getting the poison pen when you buy it as Cargo Tech,
Quartermaster, or Head of Personnel. Instead, you currently get a
Guardian kit instead.

:cl:Twinmold
Fixes: Buying poison pen will actually give you the poison pen now.
/🆑
 2017-04-05 05:16:21 -05:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Sam
88ec05be4e Couple typos and a gramatically tweak 2017-04-04 14:27:22 +01:00
Fox McCloud
00d8a089cd Merge pull request #6953 from tigercat2000/airlocks_ree 
Completely remove second power/backup wire from airlocks.
 2017-03-28 18:57:03 -04:00
Fox McCloud
28b53b465b Merge pull request #6967 from jughu/Atmos 
Fixes #6965
 2017-03-28 05:55:01 -04:00
jughu
6450c84d74 Hahehanjdjxjwnbdjsu 2017-03-28 11:43:22 +02:00
Tigercat2000
7d956d1500 Completely remove second power/backup wire from airlocks. 
Pulsing them has been broken since commit 60994c59. Not many people know
they even exist. I figure the better solution than fixing them and
introducing a new behaviour to airlock hacking is to simply remove them
completely.
 2017-03-26 17:03:41 -07:00
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