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
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
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
8e0ff6c69f
Runtime fix (hopefully), less dangerous qdel loop for pods.
2015-08-22 03:53:03 +09:30
1d13b989df
Gluttonous var changes.
2015-08-22 03:33:18 +09:30
23fa130d6a
Species attack damage nerfs.
2015-08-22 03:33:18 +09:30
6841776992
Taj/Unathi slowdown and burn/brute malus tweaks.
2015-08-22 03:33:18 +09:30
1466752166
Fixes #166
2015-08-21 14:01:05 -04:00
69dfd23d1b
Compile fix.
2015-08-22 03:26:41 +09:30
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
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
55d1bbf735
Fixes new unbalanced tag.
2015-08-21 19:26:20 +02:00
eb0f48d412
Xenos use bodytype for species_restricted, Vox can wear softsuits.
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 02:54:14 +09:30
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
8701205783
Pariah nerfs.
...
Conflicts:
code/modules/mob/living/carbon/human/species/outsider/vox.dm
code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30
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
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
d001489d14
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
bf313ae238
Merge pull request #9851 from mwerezak/armourpen
...
Adds armor penetration system
2015-08-22 02:22:17 +09:30
55c1331261
Merge pull request #10004 from PsiOmegaDelta/150703-AISight
...
Active AI cores now provides camera coverage.
2015-08-22 02:21:36 +09:30
a234d8b096
Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums
...
Admin secret panel refactor.
2015-08-22 02:18:39 +09:30
c0d2dc8ac1
Merge pull request #10787 from Zuhayr/papershredders
...
Added paper shredders from Minijar.
2015-08-22 02:11:04 +09:30
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
545e465dfc
Added paper shredders from Minijar.
2015-08-22 02:00:08 +09:30
6c27a8dd8d
Merge pull request #9159 from Kelenius/ofClicksAndCooldowns
...
Removes click cooldowns almost everywhere.
2015-08-22 01:51:05 +09:30
3632acd3db
Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess
...
Cleans out unused access definitions and sorts access lists.
2015-08-22 01:34:08 +09:30
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
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
56523d0941
Cleans out (mostly) unused access definitions and makes access lists sorted.
2015-08-21 14:45:45 +02:00
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
c074f9ee9e
Fixes a runtime with lights during explosions
2015-08-21 13:01:35 +03:00
921015d6f3
Fixes computers with custom icon states.
...
It broke the overlay system. Also makes the power monitoring computer use the overlay system.
2015-08-21 09:50:39 +02:00
54dd93997d
Useful procs are useful.
2015-08-20 20:24:15 -07:00
e9ed6fe654
Merge pull request #163 from Woodratt/Woodrat_work_v8.1
...
Woodrat Work v8.1 "Glasslock Edition"
2015-08-20 17:01:56 -07:00
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
30babe48c3
Adds medical scrubs to custom loadout
2015-08-20 19:34:35 -04:00
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
b2e9a7c2a6
Merge pull request #9942 from RavingManiac/dev
...
Sound environment revamp
2015-08-20 19:47:09 +03:00
33c352d879
Merge pull request #161 from Neerti/8/15/2015_new_ling
...
New Changeling (Part 1)
2015-08-20 11:59:57 -04:00
3baa60465e
Removes duplicate hallucination code.
2015-08-20 08:44:32 -07:00
ecaf6758df
Begins work on new ling.
2015-08-20 11:38:48 -04:00
120ce3f20c
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
...
Conflicts:
code/modules/admin/topic.dm
2015-08-20 14:16:35 +02:00
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
cd06409a1f
Makes it possible for syndicate borgs to copy access from other ids.
2015-08-20 13:49:53 +02:00
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
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
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
fd007cdea0
Merge pull request #10765 from PsiOmegaDelta/150820-ComputerOverlays
...
More computer overlay changes.
2015-08-20 19:18:13 +09:30
81ccf07d80
Halloss now decays naturally after hallucinations, to avoid edge cases with other sources.
2015-08-20 02:26:46 -07:00
dc35b0e717
fix wonky diagonal inputs
2015-08-20 09:42:48 +01:00
PsiOmega