Commit Graph

233 Commits

Author SHA1 Message Date
PsiOmegaDelta
63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into !
Conflicts:
	code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
mwerezak
f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
GinjaNinja32
6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Zuhayr
2d7ea3028f Merge pull request #7257 from Baystation12/master
Updating dev from master.
2014-12-07 11:28:29 +10:30
Zuhayr
1dc68e22bc Merge pull request #7258 from Baystation12/master
Updating dev-freeze from master.
2014-12-07 11:28:27 +10:30
GinjaNinja32
95c2b09c94 Fix num2hex()'s handling of zero 2014-12-06 02:20:11 +00:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
Amunak
7512246c8b Added toggleable 'chat tags' that can mark different channels in chat.
They are toggleable in the player preferences verb-tab, default is on. They are not necessarily limited to anything, it is just an image in text. The main use is to mark some distinct channels (like OOC, LOOC, admin and mod cheat, dead chat, PMs, ...). To make them more visible, easily distinguishable and perhaps more visually appealing.
2014-11-28 11:15:22 +01:00
PsiOmega
31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires
Conflicts:
	code/game/machinery/autolathe.dm
2014-11-25 11:19:39 +01:00
PsiOmega
7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
mwerezak
feaa27fff1 Cleans up monkey initialization 2014-11-23 13:44:59 -05:00
PsiOmega
7182ff9c3f /tg/ input stripping.
Borrows /tg/ html stripping code.
Ghosts are the first to be given this boon, they now have to deliberately emote things like "Spooky man and it#36&;s friends type crap".
2014-11-21 18:32:51 +01:00
Chinsky
9e818ef52f Merge pull request #6983 from PsiOmegaDelta/Event
Event Manager Control
2014-11-12 23:45:02 +03:00
PsiOmega
ddc1a617d0 Fixes and event end estimations. 2014-11-12 09:39:54 +01:00
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
PsiOmega
574a8f5570 Completes the basic random event manager. 2014-11-08 18:22:31 +01:00
Chinsky
42e2409408 Merge pull request #6942 from PsiOmegaDelta/Hacking
Wiring Upgrade
2014-11-07 03:49:38 +03:00
PsiOmega
a9ef2b61c0 Wiring Upgrade
Continues the wiring upgrade. Now cameras, airlocks, robots, and air alarms also use the new wire datum system.
Global wiring code is now removed but there are sneaky objects which didn't rely on them such as mulebots and autolathes.

Fixes a few issues from the previous upgrade.
2014-11-04 14:27:46 +01:00
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
Mloc-Argent
693574da19 update IsGuestKey for webclient guests
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-11-01 21:40:01 +00:00
Chinsky
7c284141b8 Merge pull request #6891 from PsiOmegaDelta/Z
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
GinjaNinja32
df29429e0e Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc 2014-10-30 22:59:10 +00:00
PsiOmega
bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
PsiOmega
253fcc4551 Uplink Shopping List
At round end players are presented with how which items a given traitor/mercenary team bought, and how much they spent.
2014-10-30 08:49:50 +01:00
GinjaNinja32
0aba56873c Changes dd_sortedObjectList() to use mergesort with cached sort values 2014-10-25 18:22:15 +01:00
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan
small fixes 2
2014-10-01 13:39:35 +04:00
Mloc
bb2953b283 re-port trange() from tg
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 08:50:28 +01:00
Mloc-Argent
43546fe9f0 fix stretched lighting
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:51:58 +01:00
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
2014-09-17 07:31:20 +02:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
PsiOmega
ff39ceff9c Emergency shutters down have pressure/temperature difference overlays.
Based on the emergency shutter from Paradise.
2014-09-09 15:57:33 +02:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
53bee60a27 Merge resolution. 2014-09-02 09:18:20 +09:30
JimTheCactus
eaa641adbd Fixes sanitizeSQL proc
Resolved an issue where an extra character was being removed.
2014-08-31 21:28:24 -06:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +04:00
PsiOmega
f9df93fad0 Expands the use of the new announcement system.
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
MrStonedOne
873c15178c Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote() 2014-08-18 14:07:14 +01:00
MrStonedOne
f396b94068 SQL injection fix.
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
2014-08-18 14:07:04 +01:00
Chinsky
1c5e944ce5 Merge pull request #5954 from Zuhayr/dev
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
Chinsky
37ad0e3c1c Changed optable so it would not care why victim is lying down. It would only accept victim if it was resting, so sometimes it would not recognize lying mobs as valid victims, leading to lots of unfun in surgery.
Updated surgery helper to account for that, also cleaned it up a little with replacing all the possible causes of lying down with just lying check. It's all checked in can_move already.
2014-08-11 19:07:19 +04:00