Commit Graph

8480 Commits

Author SHA1 Message Date
PsiOmega
611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
Conflicts:
	code/modules/events/radiation_storm.dm
2014-11-05 14:37:20 +01:00
PsiOmega
a216173271 Fixes server start runtime errors
Moves mech Z-level checks from New() to initialize() to ensure configuration has been read.
2014-11-05 13:18:35 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Atlantiscze
8a736f1c42 Typo fix from previous commit. 2014-11-05 11:45:24 +01:00
Atlantiscze
4560b7cc61 Buildable SMESs now work properly with power restore secret.
- Instead of setting SMES to output hardcoded amount, maximal value deducted from that SMESs variables is used.
- For example, the engineering SMES is quadcoil type, giving it maximal output of 1MW. However, hardcoded 200kW would be barely enough to run the station.
2014-11-05 11:43:13 +01:00
PsiOmega
e19a79a340 Ports verb-optimizations from /tg/
The examine, pull, and point verbs now below to the mob instead of all atoms. Based on discussion here: http://www.byond.com/forum/?post=1326139&page=2#comment8198716
As a bonus ghosts can now point. Ghost pointing should only be visible to other ghosts unless made visible by cult activities.
2014-11-05 08:52:56 +01:00
Chinsky
ed8963eb2a Merge pull request #6876 from PsiOmegaDelta/Jukebox
Area-based Jukebox
2014-11-05 09:24:09 +03:00
Chinsky
e8b8c7ab55 Merge pull request #6931 from PsiOmegaDelta/MoreZ
More Z-level compatibility
2014-11-05 09:21:52 +03:00
Chinsky
8451802dc7 Merge pull request #6933 from PsiOmegaDelta/News
Fixes #6747
2014-11-05 09:20:35 +03:00
Akai Alonkai
7243fdb284 Add Window Dismantling
Enables dismantling of a window (100% return) with a wrench, if the
window is fully unsecured. Windows which cannot be dismantled will
return a message saying so for clarity. Dismantling displays a visible
message for clarity.
2014-11-05 00:24:56 -05:00
mwerezak
fc6f3ea685 Fixes #6299 2014-11-05 00:03:39 -05:00
PsiOmega
d9b420642a Manifest ghost visibility-toggle
Ghosts which have been made visible by cultists can afterward turn themselves (in)visible at will, with a cooldown before being able to turn themselves visible after having faded from sight.
2014-11-04 17:59:29 +01: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
955b64e0a5 Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names. 2014-11-03 12:51:01 +01:00
PsiOmega
2a5e685e6e Fixes #6747
Channel names are already HTML-stripped on creation. Removes second HTML-stripping when attempting to post a new story as this appears to break name comparison later.
PDAs should now properly display stories with newlines.
2014-11-03 10:39:51 +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
PsiOmega
ff14da90b3 Random Event Overhaul
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706.
Exception is that there is always some start time variance to prevent metagaming.

Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
2014-11-03 09:22:37 +01:00
ccomp5950
9363af2a09 "Exploit Menu" uplink fix.
Double quotes will no longer break the json nanoui uses to display the data.

This fix removes the ability to use html and javascript (exploitable for nefarious reasons)

Specifying exactly what we want instead of assigning nanoui_data["exploits"] = L.fields
which passes by refernce instead of by value.

It allows us to also sanitize the input so everything that gets displayed in nanoui doesn't have html
2014-11-03 01:15:44 -05:00
mwerezak
a33fd1a2c6 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-11-02 10:33:16 -05:00
Ccomp5950
55ddbd10ff Merge pull request #6923 from mwerezak/climbing
Fixes #6660
2014-11-01 22:31:57 -04:00
Ccomp5950
01c507615d Merge pull request #6914 from PsiOmegaDelta/Bolts
More Mapping
2014-11-01 22:29:39 -04:00
Ccomp5950
9e1dfa2d97 Merge pull request #6919 from mwerezak/custom-loadout
Custom loadout updates
2014-11-01 22:29:24 -04:00
Chinsky
7bfa2661fb Merge pull request #6916 from Mloc/bs12-server
serverside fixes
2014-11-02 04:47:26 +03:00
Chinsky
e81a478bf3 Merge pull request #6907 from PsiOmegaDelta/EmergencyShutters
(De)constructable emergency shutters.
2014-11-02 04:47:20 +03:00
Chinsky
f74c6ec97a Merge pull request #6912 from mwerezak/boatswain
Adds sound for the captain-spawning announcement
2014-11-02 04:40:19 +03:00
Chinsky
5d7a233bc7 Merge pull request #6851 from RavingManiac/dev
Breakable doors, door and window damage messages
2014-11-02 04:40:12 +03:00
mwerezak
b2dc8f1142 Fixes #6660
Also makes flipping tables block climbing.
2014-11-01 21:38:04 -04:00
mwerezak
97bdcca033 Fixes bad handcuff check 2014-11-01 17:02:54 -04:00
mwerezak
a9399c2b79 Custom loadout updates
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
PsiOmega
19b157db10 More Mapping
Fixes #6913.
Splits the arrival section up into sub-areas to reduce the need of crew rescue.
Makes catwalks act as plating instead of floor.
Misc. changes.
2014-11-01 19:20:34 +01:00
bs12
a6934a531b gameticker.dm crash fix
Signed-off-by: bs12 <bs12@bs12.bs12>
2014-11-01 16:17:18 +00:00
mwerezak
3f2aeb6dc4 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-11-01 11:49:15 -04:00
mwerezak
1bd235878f Captain join announcement sound
Adds a sound to the announcement that is made when the captain joins.
The sound only plays if the captain joins after round start.
2014-10-31 22:34:22 -04:00
mwerezak
5372b526a1 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-10-31 20:29:00 -04:00
Chinsky
7c284141b8 Merge pull request #6891 from PsiOmegaDelta/Z
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
Chinsky
46a8bc8c94 Merge pull request #6902 from GinjaNinja32/machinelist
More machinery list speedups
2014-11-01 02:18:09 +03:00
Ccomp5950
c78ce51cb0 Merge pull request #6890 from PsiOmegaDelta/Maps
The great bed increase.
2014-10-31 12:16:02 -04:00
PsiOmega
f8ead9139a (De)constructable emergency shutters.
Can now construct emergency shutter assemblies from metal sheets, same as door assemblies.
Requires air alarm circuits to complete, rather than airlock circuits.
2014-10-31 13:35:48 +01:00
mwerezak
e7dcda13de Adds feedback when handcuffs cannot be placed, fixes robot cuffs. 2014-10-30 20:13:01 -04:00
GinjaNinja32
df29429e0e Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc 2014-10-30 22:59:10 +00:00
Chinsky
5404a18045 Merge pull request #6886 from PsiOmegaDelta/ShoppingList
Uplink Shopping List
2014-10-30 22:13:39 +03:00
Chinsky
be7a9bcf3a Merge pull request #6882 from PsiOmegaDelta/JobController
Lobby menu refreshment
2014-10-30 22:13:19 +03:00
Chinsky
53aa85fa08 Merge pull request #6887 from Glloyd/fixes
Fixes #5796
2014-10-30 22:13:08 +03:00
RavingManiac
027995c041 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-30 23:24:33 +08:00
RavingManiac
fe18a7d761 Bug where non-airlock doors would disappear upon power update fixed.
Metal rods no longer work as improvised crowbars with regards to unpowered/broken doors.

Glass airlocks now have 300 health. Hit sounds changed.

At least 10 force now needed for weapon to be able to damage doors.
2014-10-30 23:23:44 +08: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
010929252b The great bed increase.
Increases both the number of beds and cryogenic freezers.
More cables in maintenance.
Restores electricity to the CE's space windows.
2014-10-30 13:10:11 +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
Chinsky
67fbe9a66e Merge pull request #6835 from PsiOmegaDelta/PortaTurret
Portable turrets update
2014-10-30 00:11:57 +03:00
Chinsky
ee581514f7 Merge pull request #6873 from PsiOmegaDelta/Extinguish
Fixes #6871
2014-10-30 00:11:05 +03:00