PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
PsiOmegaDelta
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
Chinsky
1a7b0e33a4
Merge pull request #10758 from FrickenChris101/patch-1
...
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
Zuhayr
89f498e3e8
Merge pull request #10811 from mwerezak/qdel
...
Fixes
2015-08-23 07:41:10 +09:30
mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 02:31:19 -04:00
mwerezak
4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238
Merge pull request #9851 from mwerezak/armourpen
...
Adds armor penetration system
2015-08-22 02:22:17 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Zuhayr
b4b7719557
Merge pull request #9888 from Vivalas/dev
...
[DEV] Re-adds the new uplink item
2015-08-22 01:34:01 +09:30
PsiOmegaDelta
1e7251ded4
Id card handling changes.
...
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
2015-08-21 14:04:06 +02:00
Chinsky
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
PsiOmegaDelta
cd06409a1f
Makes it possible for syndicate borgs to copy access from other ids.
2015-08-20 13:49:53 +02:00
PsiOmegaDelta
c346b99371
Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess
...
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
2015-08-20 12:42:51 +02:00
PsiOmegaDelta
c2e2252342
Synth access and icon update changes.
...
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
2015-08-20 12:40:08 +02:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
FrickenChris101
a4b3ab1ca5
Flashlight Icon toggle fix
...
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
2015-08-19 20:17:59 -04:00
mwerezak
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
mwerezak
2cb46e035c
Removes unused obj flags and fixes overlapping flags
...
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
mwerezak
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
HarpyEagle
c136bd47cc
Improves shard-stepping
2015-08-18 17:01:39 -04:00
GinjaNinja32
a5e975ce1c
Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir
2015-08-18 13:43:11 +01:00
Zuhayr
80dbe49ee1
Removing unneeded defines.
2015-08-19 14:23:27 +09:30
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07:00
Zuhayr
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07: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
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02: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
3b712adb5f
Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.
2015-08-16 17:51:19 -07:00
PsiOmega
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
PsiOmega
aa475ea23c
Adds (dirty) steel tiles.
2015-08-16 06:07:59 -07:00
PsiOmega
ddcc06d55f
Additional floor decal icons.
...
Adds grey, purple, and white floor decals.
Adds full red and yellow floors, both for floor and floor tile.
Makes the U-shaped warning sprites match the straight and L-shaped sprites.
2015-08-16 06:07:51 -07:00
Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
PsiOmega
b879db05b4
Makes the fake crew record creation utilize all the new id fields.
2015-08-15 17:03:19 +02:00
PsiOmega
c51e208094
One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686 .
2015-08-15 15:22:37 +02:00
PsiOmega
c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
Snapshot
5f5671d21f
Merge pull request #10647 from mwerezak/acids
...
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
PsiOmegaDelta
54616641bf
Upgraded Syndicate id.
2015-08-14 17:31:58 +02:00
