Commit Graph

6793 Commits

Author SHA1 Message Date
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
PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
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 a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
Conflicts:
	code/_onclick/rig.dm
2015-08-22 02:36:05 +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
PsiOmega d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
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
Kelenius 6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm
2015-08-21 16:59:57 +03:00
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
Woodrat 7a42e001f8 Woodrat Work v8.1 "Glasslock Edition"
- Air Alarm added to tool storage and security port maintenance
- Fire Alarm and General Radio added to port emergency shuttle hallway.
- Fire alarm, radios, fire extinguishers, and glasslocks added to the central ring.
- Art Storage now has a light switch
- Blocking walls added to unused airlocks at central. Turret control and more turrets added on central.
- Glasslocks added all the way down the cargo hallway and in cargo. Fire alarms added as well.
- Fore Escape Pod hallway glasslocked and camera'd
- Phoron sheets for engineering generator readded to the crate in hard storage.
- Solar array on the engineering outpost now has a area, more outside lights.
- Cameras installed around the entire central ring.
- Civilian sector and library fully glasslocked.
- Handlabeler and newscaster added to visitor's lobby.
- Downgraded the amount of water used by fire extinguishers from eight to two.
- Changes made to make fire extinguishers useless against slimes half fixed.
- Added fuzzy cuffs
- Rigsuit knives now a option.
- Cameras added all the way through the civilian area hallways.
- AI pet called Steve.
2015-08-20 16:55:56 -07: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 a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02: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
Woodrat 7d65038d38 Woodrat Work 8.0 Boot Knife DLC
- Industrial Hardsuit RCD removed
- Single Action figure added to the vacant shop.
- Comfort creature added to the psych office.
- Piping underneath the holodeck control doors removed.
- Firelocks along the fore part of the central ring now glasslocks
- Air Alarms added to the cyborg station, upload foyer, messaging server room.
- Light switch, fire alarm radio, and air alarm added to secondary tool storage.
- Coffee shop shutters and door properly labeled.
- Status display added to the IA office.
- Second photo album added to the detective’s office.
- Removed forgotten items on mining z-level. I.E. I screwed up.
- Atmos backwards pumps should be fixed and sorted.
- Distro and waste lines tweaked in atmos.
- Crowbars should now be dispensed from oxy wall lockers.
- Tweaked the variables on the outpost SMES units. New SMES added to the mining engineering outpost.
- Pill cabinets added to the medbay at central.
- Mulebots should have proper access now.
- Overhaul to parts of the mining z-level. Fixed several issues brought up.
- Spoons added to the cafeteria
- One extra ERT suit for each role added to the ERT area.
- New item, combat knife. Should be robustier than the tactical knife. Available for ERT and two for the mercs.
- New item, marine boots. Basically just renamed jackboots at the moment.
- Tactical Knives and combat knives can now be put into swat boots and marine boots.  Depending on how well the feature works will be expanded to include other boots.
2015-08-17 20:47:05 -07:00
PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +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 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
Kelenius 3b1c5666d5 Merge branch 'dev' into ofMechfabAndPanic 2015-08-17 09:58:23 +03: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
mwerezak 77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
mwerezak a773715ff9 Adds frag grenade sprites 2015-08-15 18:47:35 -04: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