Commit Graph

11233 Commits

Author SHA1 Message Date
PsiOmegaDelta
afd526126d Fire extinguisher fixes and tweaks
Port of https://github.com/PolarisSS13/Polaris/pull/713.
2016-01-08 14:47:18 +01:00
Hubblenaut
a89c066905 Fixes onmob icons for holders
Conflicts:
	code/game/objects/items.dm
2016-01-08 14:47:08 +01:00
Datraen
18d0c782fb Adds extended info to certain game modes missing extended info.
Conflicts:
	code/game/gamemodes/heist/heist.dm
2016-01-08 14:47:03 +01:00
PsiOmegaDelta
f9b61ed1ec Merge pull request #11943 from Baystation12/dev-freeze
Dev
2016-01-08 14:27:32 +01:00
Chinsky
f569d55527 Merge pull request #11911 from Kearel/modificationsAndFixes
Modifications to actor verb, orion trail, and board game.
2016-01-08 09:21:03 +03:00
Ccomp5950
97c0635fad Merge pull request #11927 from comma/devfix
Devfixes
2016-01-07 13:03:26 -05:00
Chinsky
2f67cb18d8 Merge pull request #11898 from Hubblenaut/dev
Diverse Police Tape fixes/tweaks
2016-01-07 20:50:32 +03:00
PsiOmegaDelta
fcc8389203 Floor construction now checks stack subtypes.
Fixes #11930.
Also makes the robot fabricator use proper paths because I found it while searching for build type.
2016-01-07 17:14:09 +01:00
Hubblenaut
cd0a1221d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-07 14:37:18 +01:00
PsiOmegaDelta
14f373983f Also makes the economic species modifier more general. 2016-01-07 12:23:04 +01:00
PsiOmegaDelta
1b564bb179 Map and icon tweaks.
Re-adds medical examination wall and chapel mass driver button.
Ensures that the chapel crematorium button does not lose its default icon on icon update.
Fixes #11915. Fixes #11894.
2016-01-07 11:56:06 +01:00
Chinsky
f7b0f2796e Merge pull request #10095 from RavingManiac/dev-2
Capacity-based storage system
2016-01-07 07:17:10 +03:00
Chinsky
bc390c5603 Fixes #11914 2016-01-07 05:49:16 +03:00
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check.
Fixes #11900.
2016-01-06 18:31:39 +01:00
Hubblenaut
e1f58161ac Diverse Police Tape fixes/tweaks 2016-01-05 19:14:18 +01:00
RavingManiac
a8cea3862d Backpack and box storage capacity set to 16 and 8 respectively. Maximum w-class set to 4 and 3 respectively.
Storage box sprite made lighter to improve visibility against dark backgrounds.
2016-01-05 22:26:15 +08:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
PsiOmegaDelta
b08533b500 Species economy modifier now defaults to human if missing.
Fixes  #11891.
2016-01-04 09:38:31 +01:00
PsiOmegaDelta
6aea83aeb3 Replaces mega-health windows.
Mega health windows (the old 1e007 Crescent windows) are now replaced with with either normal reinforced windows or the Crescent window sub-type or relevant window spawners.
Also changes the security sub-armory window from dir 5 to 2 (non-cardinal directions transforms windows into full-tile ones, it's no longer visible in the mapper). Fixes  #11889.
Adds pre-defined full tile reinforced windows for when those are needed.
2016-01-03 20:57:34 +01:00
PsiOmegaDelta
b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating.
Fixes #11852.
2016-01-03 12:49:27 +01:00
PsiOmegaDelta
a2a5e367f6 Adds a chilled N2 canister to Research Server room.
With minor cleanup included. Fixes #11790.
2016-01-02 19:15:59 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta
ebdd394e4f Merge pull request #11868 from hockeygoalie5/fixes
Fixes
2016-01-01 23:29:45 +01:00
Chinsky
e947862886 Merge pull request #11851 from atlantiscze/31-12-2015-consolepresets
Modular Consoles, Tweaks
2016-01-02 01:25:50 +03:00
Mustafa Kalash
9a2245fe65 Fixes #11864 2016-01-01 15:05:22 -05:00
Chinsky
03a4ef022e Merge pull request #11849 from PsiOmegaDelta/151231-Atmotop
Fixes atmospherics laptops proper.
2016-01-01 21:11:45 +03:00
PsiOmegaDelta
0f44645a75 Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing
Removes oxygen_agent_b and volatile_fuel gases
2016-01-01 12:18:18 +01:00
Kearel
2a44128b78 Modifications to actor verb, orion trail, and board game.
Orion Trail only works when power is on now.
'Join as Actor' verb will now prompt you to make sure.
Boardgame can now be picked up by those viewing it (makes it easier to
view)
2015-12-31 17:54:25 -06:00
Atlantis
0d10e4b1ef Removes oxygen_agent_b and volatile_fuel gases
- oxygen_agent_b wasn't used at all, except for filters which, for some reason filtered it in addition to phoron
- volatile_fuel was only used in two chemistry reactions as reaction result, it was replaced with gaseous phoron.
2016-01-01 00:34:59 +01:00
PsiOmegaDelta
f99be6ac3d Merge pull request #11847 from headswe/whitelist_fix
Alien Whitelist SQL version
2015-12-31 22:56:14 +01:00
PsiOmegaDelta
bbb84e02b9 Fixes atmospherics laptops proper.
Adds a new laptop overlay that fits the atmospherics computer.
2015-12-31 12:42:18 +01:00
Karolis2011
3076884f6e Adds new modular ID modification console and
removes old console. This commit won't compile.
2015-12-31 13:17:31 +02:00
Sebastian Broberg
10640b172d Alien Whitelist SQL version 2015-12-31 10:56:04 +01:00
Chinsky
90301c67c1 Merge pull request #11794 from Kearel/qolmystuff
Microwave/Board game QoL stuff
2015-12-31 01:03:58 +03:00
Ccomp5950
8c8e1ae348 Merge pull request #11836 from PsiOmegaDelta/151230-GlowyStuff
Door related glow.
2015-12-30 15:18:13 -05:00
PsiOmegaDelta
6ff99e2bd7 Door bolt lights and alarming emergency shutters now glow. 2015-12-30 20:32:14 +01:00
GinjaNinja32
a56597a3c5 Merge pull request #11823 from PsiOmegaDelta/151230-MapTweaks
Fixes.
2015-12-30 18:48:44 +00:00
PsiOmegaDelta
0922cf5e2f Floor decals now layer below the turf layer.
This doesn't actually make them invisible, as turfs will always display below everything else, but will ensure decals display below anything else on turf level.
Fixes #10754. Fixes #11826.
2015-12-30 18:07:46 +01:00
PsiOmegaDelta
0425b60d66 The GetIdCard() proc now priorities held id cards.
Fixes #11824 to the maximum degree I'm prepared to go.
2015-12-30 12:07:13 +01:00
PsiOmegaDelta
ac39757a03 Blast doors now explicitly set opacity to 1 when dense (i.e. when closing).
Fixes #11789.
2015-12-30 11:53:45 +01:00
PsiOmegaDelta
96cbc225ff Bags with the auto-pickup ability can no longer grab anchored objects.
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
2015-12-30 11:28:54 +01:00
Chinsky
e512061d3c Merge pull request #10002 from atlantiscze/NTOSv2
[READY FOR MERGE] Modular Computers
2015-12-30 06:57:27 +03:00
Ccomp5950
ef8517417f Merge pull request #11817 from PsiOmegaDelta/151229-BumpDoor
Resomi can now bump doors open.
2015-12-29 17:57:36 -05:00
PsiOmegaDelta
ec488d2b46 Resomi can now bump doors open.
QoL.
2015-12-29 20:38:54 +01:00
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
Zuhayr
a2e96adefb Fix for brains ending up popping out of cryo consoles. 2015-12-29 14:03:58 +01:00
Kearel
77aa5782f0 now only uses 'secure' for the text given when anchoring microwaves 2015-12-29 01:18:00 -06:00
Kearel
419a41ee5b changes descriptive text in microwave anchor/unanchoring 2015-12-29 00:45:53 -06:00
GinjaNinja32
865a25e0b5 work around BYOND bug causing #11785
#11785
2015-12-29 06:10:33 +00:00
Kearel
278b44cb9f Small QOL changes
Boardgame now looks like a checkerboard. It now updates whenever
something is added to it.

Microwave can now be unanchored via a crowbar.
2015-12-28 16:15:49 -06:00