Commit Graph

20230 Commits

Author SHA1 Message Date
PsiOmega
439b976272 Admin level doors are now always of the secure variant.
Players keep finding ways to surprise.
2015-08-17 22:41:19 +02:00
mwerezak
b24e691b8c Merge pull request #10683 from SomeoneElse2/dev
Research minor fixes, fix item design path definition, macro usage
2015-08-17 14:23:00 -04:00
Chinsky
a4550dd957 Merge pull request #10699 from PsiOmegaDelta/150817-Robofite
Harm icon state consistency.
2015-08-17 20:32:41 +03:00
GinjaNinja32
e596d3bdd6 Merge pull request #10681 from mwerezak/lighting
Ports fix for #10660
2015-08-17 14:17:53 +01:00
PsiOmegaDelta
c82a0291e4 Utensil knives and spoons are no longer contraband.
After careful considerations by the council the law concerning Possession of a Controlled Utensil is finally abolished.
The Dinnerware vending machine now offer both utensil knives and spoons without first having to hack them.
2015-08-17 13:22:41 +02:00
Zuhayr
b9c95148fd Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment
fix access artifacts from #9263
2015-08-17 04:06:06 -07:00
Zuhayr
0e6a184f10 Merge pull request #10703 from GinjaNinja32/cryostorage
adds admin logs to cryostorage
2015-08-17 04:05:46 -07:00
GinjaNinja32
0c8a2b16e0 adds admin logs to cryostorage 2015-08-17 11:34:26 +01:00
Zuhayr
e61eb26da9 Merge pull request #10701 from GinjaNinja32/virus
fix #10692
2015-08-17 03:11:16 -07:00
Zuhayr
b27811ee07 Merge pull request #10700 from GinjaNinja32/locket
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 03:04:42 -07:00
GinjaNinja32
a2817d9b8c fix #10692 2015-08-17 10:54:51 +01:00
GinjaNinja32
4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
PsiOmegaDelta
edebf946d8 Harm icon state consistency.
All icon states relating to the I_HARM intent now all use the same naming convention.
2015-08-17 10:16:39 +02:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta
9c08b58534 Code relocation. 2015-08-17 09:38:34 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
Zuhayr
82a368c0c4 Merge pull request #10690 from NullSnapshot/hotfix
Bandaid fix for process scheduler bloating status tab
2015-08-16 23:54:34 -07:00
NullSnapshot
e99f98e13f No need for the statpanels. 2015-08-16 23:24:25 -07:00
PsiOmegaDelta
9d0c072b4a Adjusts Bump flags to make ALLMOBS mean all mobs again. 2015-08-17 08:06:42 +02:00
NullSnapshot
438837a9be Moves ProcessScheduler list to new Processes tab. 2015-08-16 22:46:18 -07:00
PsiOmegaDelta
1dcdb423c7 Merge pull request #10685 from mwerezak/skipjack
Fixes
2015-08-17 06:56:50 +02:00
GinjaNinja32
917f6f0250 Add Medical Equipment access to Chemists 2015-08-17 05:45:34 +01:00
Zuhayr
ac261213e9 Rewrites the floor painter. 2015-08-16 20:58:54 -07:00
Zuhayr
3f833f2b24 Reimplemented floor lights as a machine built at the autolathe. 2015-08-16 19:26:17 -07:00
Zuhayr
84c778959a Added proper gas turfs for atmos, remapped atmos turfs. 2015-08-16 18:18:04 -07:00
Zuhayr
3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Zuhayr
23e9c7d4c9 Merge 2015-08-16 17:10:11 -07:00
mwerezak
f09b754a19 Fixes #10636 2015-08-16 15:20:59 -04:00
mwerezak
887a515483 Fixes #10659 2015-08-16 14:58:50 -04:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmega
4d826e68cb Mob bump fixes.
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
2015-08-16 20:55:02 +02:00
Hubblenaut
d2e2574f07 Merge remote-tracking branch 'upstream/dev' into dev 2015-08-16 20:39:50 +02:00
SomeoneElse
9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
2015-08-17 00:25:37 +06:00
mwerezak
b21bd0c42d Ports fix for #10660 from vg
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
GinjaNinja32
f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
Synth say fixes.
2015-08-16 14:55:04 +01:00
GinjaNinja32
0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
PsiOmega
21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
Zuhayr
c72a746f20 Compile fixes. 2015-08-16 06:29:04 -07:00
Zuhayr
932f87faa5 Semi-fixes turf layering issues with pipes and newflooring. 2015-08-16 06:09:36 -07:00
PsiOmegaDelta
5846de37be Fewer decal icon states, shower curtains.
Someone had added shower curtains to the map. Creates proper definitions to avoid colors being lost on cleaning.
Floor corner decals now all utilize a white base state and simply apply a color.
2015-08-16 06:09:16 -07:00
PsiOmegaDelta
c1eba26d8a Holo-decals and fixes.
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
2015-08-16 06:09:15 -07:00
mwerezak
de6e878411 Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names.
Made set_flooring take a flooring instance, in case calling code already
had a flooring instance it seemed wasteful to have to look up the
flooring all over again.
2015-08-16 06:09:09 -07:00
mwerezak
ed0a089fb6 Fixes turf decal overlays layering with holopads
Holopads layer at TURF_LAYER + 0.1 so there is the possibility that turf decals might layer over them. This ensures that decals layer under holopads.
2015-08-16 06:08:22 -07:00
mwerezak
15599ab6c8 Mapping - minor airlock and other details
Finishes main medical decals (adds light blue and light yellow corner
colours), adds various touch ups to mining and incinerator airlock,
science and security blast doors. Makes the science bomb test range
airless. Removes SS13 placard. Adds privacy curtains to the medical ward
and dorms.
2015-08-16 06:08:21 -07:00
Zuhayr
1fa93c270d Various small tweaks for the flooring update. 2015-08-16 06:08:19 -07:00
PsiOmega
b55be47521 Adds dusty warning stripes. 2015-08-16 06:08:10 -07:00
PsiOmega
076a456d6f Adds additional floor icons.
Adds additional grey and lime cornel decal icons.
Adds directional Space Station 13 icons.
2015-08-16 06:08:01 -07:00
PsiOmega
aa475ea23c Adds (dirty) steel tiles. 2015-08-16 06:07:59 -07:00
PsiOmega
593023443f Fixes floor decal dir and layer not being respected. 2015-08-16 06:07:58 -07:00
PsiOmega
11fe86da58 More floor decals.
Adds additional red decal icons.
Adds grey outline decal.
2015-08-16 06:07:54 -07:00