Commit Graph

379 Commits

Author SHA1 Message Date
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
tigercat2000
96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework
Grey Rework
2017-06-30 08:29:31 -07:00
Crazylemon64
72841c9e70 Refactors TK to work a bit more consistently
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07:00
Fox-McCloud
673f18f3e7 tweaks 2017-06-05 17:14:04 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
fludd12
9d74b9090a Last fix, I hope 2017-05-16 23:51:37 -04:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
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
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Sam
139f5111a8 Syndicate papparazi 2017-03-28 10:00:29 +01:00
Crazylemon64
009c0f9c3c Pens no longer use comic sans 2017-03-25 02:57:32 -07:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +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
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Kyep
18eb3fa4e0 Cost: 5->2 TC, Reagent:Sarin->Amanitin 2017-03-04 22:50:20 -08:00
Kyep
5ca4d306db More logging 2017-03-01 23:56:55 -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
Crazy Lemon
992fae8cf5 Merge pull request #6500 from davipatury/secure_data-ui
Security Records Nano-UI-ification
2017-02-25 16:59:59 -08:00
Crazy Lemon
e81592c3db Merge pull request #6499 from davipatury/med_data-ui
Medical Records Nano-UI-ification
2017-02-24 18:53:33 -08:00
Markolie
707b926881 Fax fix 2017-02-22 18:48:50 +01:00
Markolie
8432113c59 Add eject ID card to fax machine 2017-02-22 18:36:10 +01:00
Markolie
c5b897a951 Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers 2017-02-22 18:24:43 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
davipatury
93d1cd7c6e Security Records nano-ui. 2017-02-18 15:58:01 -02:00
davipatury
ba193fdd10 Medical Records nano-ui. 2017-02-18 14:36:37 -02:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Fox McCloud
e0b23a1e10 Merge pull request #6421 from tigercat2000/library
Improve View Flagged Books admin verb
2017-02-17 14:01:28 -05:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Tigercat2000
1cfbeaeddb Improve View Flagged Books admin verb
This changes the "View Flagged Books" admin verb into a datum/browser
UI. You can see all the books that have been flagged from here, review
them, and remove the flagged status or delete them.

Also refactors pencode into some __HELPER procs, and adds a
"reverse-pencode" proc. It's not perfect, due to the complexity of HTML
and my unwillingness to use BYONDregex, but it's good enough to get the
general idea of the formatting across. It's used for the new "view book"
panel.
2017-02-12 08:44:48 -08:00
Markolie
b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie
1e97a262b8 Admin interaction fixes 2017-02-10 01:20:01 +01:00
Markolie
4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2
Announcement refactor
2017-01-18 19:17:30 -08:00
Krausus
b193394c60 Fixes video cam's networkless camera 2017-01-06 04:56:10 -05:00
Crazylemon64
f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
FalseIncarnate
27e7dabed7 Pick up that paper
Photocopiers and Fax Machines will now attempt to place the removed
source material into the hand of the user... if they are human only.
2016-12-29 21:46:20 -05:00
FalseIncarnate
eba3d10966 Fixes #6029
Also applies to photocopiers (which fax machines are a subtype of), and
replaces a bunch of thing.loc = src.loc and thing.loc = src with proper
forceMove calls
2016-12-29 20:40:57 -05:00
Crazy Lemon
ac597b7f8b Merge pull request #5806 from Markolie/cameraconsoleupdate
Camera console update
2016-12-29 01:18:21 -08:00
KasparoVy
59d7f71145 👀 2016-12-23 21:14:50 -05:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
Markolie
84c8b2e12b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
# Conflicts:
#	code/game/machinery/computer/camera.dm
2016-12-23 18:58:58 +01:00
KasparoVy
e00814e36c Cameras Now Handle Disguises
Fixes a bug where you could take a picture of stuff behind walls (ghetto
X-Ray).
Pictures will now render people with disguises as you see them (borgs
see people with cardborg suits as borgs, people with cardborg suits see
themselves as borgs, everyone sees people carrying plants as plants)
although they will also state the person's name, regardless of disguise
(same as mouseover).
2016-12-21 22:31:13 -05:00
Tigercat2000
b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Fox-McCloud
a880f740d2 Fixes Paper's In-hand Icon 2016-11-09 20:38:16 -05:00