Commit Graph

339 Commits

Author SHA1 Message Date
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
Markolie
ffc74cda0a Announcement fixes, change most command announcements to event announcements 2016-10-25 15:21:16 +02:00
Markolie
b710d139e6 Update camera console based on mob refactor 2016-10-23 00:07:13 +02:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
Krausus
b0ac462166 Integrates UIDs into View Variables 2016-09-08 19:04:50 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
SamCroswell
a0dd7a1cce Emag Changes 2016-09-02 18:09:17 -04:00
SamCroswell
73b845721e I WILL GET LYNCHED FOR THIS 2016-09-02 16:58:39 -04:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
bf5a467697 better check 2016-07-31 16:13:19 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Fox-McCloud
47b15bec0f More Makeshift Items/Weapons 2016-07-25 02:35:01 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify
Makes a bunch of UI's use /datum/browser
2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
Plastic Explosives Update
2016-07-16 04:07:12 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
TullyBurnalot
ed1e6b1305 Adds Photocopier Cooldown when emagged 2016-07-13 04:25:58 +01:00
Fox McCloud
5dc65d9137 Merge pull request #4984 from Kyep/evilfax_cluwne
Adds Cluwne EvilFax
2016-07-12 17:14:50 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate
Bureaucracy Update
2016-07-11 21:20:06 -04:00
Kyep
e14f1b7529 Adds Cluwne EVILFAX
Fox Changes

Fox Spacing
2016-07-11 00:39:11 -07:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
10292105ad Makes a bunch of UI's use /datum/browser 2016-07-10 09:19:14 -04:00
Fox McCloud
f20ac43730 Merge pull request #4909 from TullyBurnalot/PAEPERVERK
Admin Fax Template Flair
2016-07-09 18:54:32 -04:00
Fox McCloud
443e530f08 Merge pull request #4923 from TullyBurnalot/PhotocopyEmag
Photocopier Emagging and Toast
2016-07-09 18:32:55 -04:00
TullyBurnalot
9b614a9df0 - Changed atom_say_verb
Photocopiers now "bleep" rather than "say"
2016-07-09 16:00:49 +01:00
TullyBurnalot
52cc7786c0 - Replaced visible_message with atom_say
What the title says
2016-07-09 01:27:34 +01:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
8953ea6fbf Removes needless src
- Woops
2016-07-08 02:57:17 +01:00
TullyBurnalot
018c771cf6 Adds ping noise
- Photocopiers actually ping when copying butts
2016-07-08 02:30:57 +01:00
TullyBurnalot
65edca1010 Adds spaces
- Adds spaces in to_chat(H)
2016-07-08 02:19:25 +01:00
TullyBurnalot
dba4ed1f3a Fixes Tiger's suggestions
- 2 instances of "ass" changed to "H"
2016-07-08 01:31:06 +01:00
TullyBurnalot
ba8844af85 Fix to DZD's suggestions
- Sleep(20) changed to Spawn(20)
- Needless code removed
- Damage upgraded to 30 Burn
2016-07-08 00:55:35 +01:00
TullyBurnalot
7972dbff32 Adds Posterior Burning
- Photocopiers can now be emagged;
- Photocopiers deal 20 Burn damage to any mob attempting to fax their
posterior
2016-07-08 00:37:37 +01:00
TullyBurnalot
4086396f0e Added an exclamation mark
Pedantry
2016-07-07 20:38:23 +01:00
TullyBurnalot
2dce5ec8f1 Bureaucracy Update
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
2016-07-07 20:24:07 +01:00
TullyBurnalot
4a84ced8fd Removed Stamps. Removed memes.
- No more denying over lack of stamps. Just lack of signatures;

- No one ever referenced Memetic Kill Agents. No one.
2016-07-07 04:34:44 +01:00