Commit Graph

15385 Commits

Author SHA1 Message Date
Chinsky
e8b8c7ab55 Merge pull request #6931 from PsiOmegaDelta/MoreZ
More Z-level compatibility
2014-11-05 09:21:52 +03:00
Chinsky
1e10b76b25 Merge pull request #6932 from PsiOmegaDelta/RoboDestruction
Cyborg detonation notice
2014-11-05 09:20:57 +03:00
Chinsky
8451802dc7 Merge pull request #6933 from PsiOmegaDelta/News
Fixes #6747
2014-11-05 09:20:35 +03:00
Chinsky
d28d7b8c2f Merge pull request #6846 from mwerezak/fire-extinguishers
Water cools hot turfs even if they do not have a hotspot.
2014-11-05 09:03:35 +03:00
PsiOmega
cb6a855292 Cyborg detonation notice
When a cyborg is detonated by a cyborg console  the AI is now notified about the event.
Violently applied destruction remains without notice.
2014-11-03 19:40:24 +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
mwerezak
6ac3c4c359 More custom loadout jackets + bandana
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
2014-11-02 22:51:33 -05:00
mwerezak
a33fd1a2c6 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-11-02 10:33:16 -05:00
mwerezak
7e2e44a61a Adds Searif's leather jackets as a custom gear 2014-11-01 23:12:21 -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
e81a478bf3 Merge pull request #6907 from PsiOmegaDelta/EmergencyShutters
(De)constructable emergency shutters.
2014-11-02 04:47:20 +03:00
Chinsky
b64d704f8f Merge pull request #6903 from mwerezak/bite
Adjusts secondary unarmed attacks
2014-11-02 04:41:10 +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
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
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
Chinsky
1f54af9b2c Merge pull request #6897 from PsiOmegaDelta/DynamicRadio
Makes the AI radio channel listing more dynamic.
2014-11-01 02:17:55 +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
4c9cda8d7e Adjusts secondary unarmed attacks 2014-10-30 19:57:59 -04:00
GinjaNinja32
df29429e0e Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc 2014-10-30 22:59:10 +00:00
PsiOmega
4a7199020c Makes the AI radio channel listing more dynamic. Kills copy-pasting. 2014-10-30 22:27:58 +01:00
Chinsky
5404a18045 Merge pull request #6886 from PsiOmegaDelta/ShoppingList
Uplink Shopping List
2014-10-30 22:13:39 +03:00
Chinsky
fff3622386 Merge pull request #6884 from PsiOmegaDelta/LobbyVote
Fixes #6881
2014-10-30 22:13:32 +03:00
Chinsky
be7a9bcf3a Merge pull request #6882 from PsiOmegaDelta/JobController
Lobby menu refreshment
2014-10-30 22:13:19 +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
3ab3f86239 Merge pull request #6875 from MagmaRam/dev
Updated EVA and atmos manuals to match recent game changes.
2014-10-30 00:10:59 +03:00
PsiOmega
bd08ee99b2 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-29 19:17:35 +01:00
PsiOmega
6ec31fc48e Fixes #6881
Automatic votes do not have to wait for vote cooldown.
2014-10-29 15:19:35 +01:00
PsiOmega
12d90332f9 Lobby menu refreshment
If one was returned to the lobby after failing to acquire a job the lobby menu should now be refreshed, properly displaying Join Round/Observe instead of Declare Ready.
2014-10-29 14:23:32 +01:00
MagmaRam
b12674c18c Changed phrasing about pressure with full oxygen internals as suggested by mwerezak.
Fixed typo pointed out by Glloyd.
2014-10-29 01:49:28 -04:00
Chinsky
c8e27555b9 Merge pull request #6857 from mwerezak/hoverpod
Hoverpod tweaks and mecha/working code cleanup
2014-10-29 06:31:20 +03:00
Chinsky
3887ada4a4 Merge pull request #6866 from PsiOmegaDelta/Bomber
Most minor spelling correction.
2014-10-29 06:31:11 +03:00
Chinsky
6ca49f4c8d Merge pull request #6867 from PsiOmegaDelta/Anomaly
Adds hand labeler to the Excavation tools closet.
2014-10-29 06:30:57 +03:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA
PDA newscast reception
2014-10-29 06:30:54 +03:00
Chinsky
766fe2a100 Merge pull request #6863 from mwerezak/poncho
Adds two new poncho types
2014-10-29 06:30:31 +03:00
Chinsky
8430dc0af0 Merge pull request #6858 from mwerezak/sleepers
Sleepers now use power when synthesizing chemicals
2014-10-29 06:30:21 +03:00
Chinsky
120561cd4a Merge pull request #6862 from PsiOmegaDelta/RadioAI
The AI now has a radio channel for its private frequency + Clone Cleanup
2014-10-29 06:30:07 +03:00
mwerezak
e549a22bba Removes world print, re-adds react() call
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00