c7bd20ceb6
Rig AI fixes.
...
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
2015-08-23 13:33:10 +02:00
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
d45d46f920
Resprites, renames, and repaths the detective uniforms.
2015-08-22 19:43:28 -05:00
89f498e3e8
Merge pull request #10811 from mwerezak/qdel
...
Fixes
2015-08-23 07:41:10 +09:30
4c09fc1e4a
Merge pull request #173 from Woodratt/Woodrat_Work_v8.2
...
Woodrat Work v8.2
2015-08-22 12:42:21 -07:00
c192378bab
Woodrat Work v8.2
...
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
9cbacd6653
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/click.dm
2015-08-23 02:24:34 +09:30
2fbe9ddb8f
Merge pull request #10809 from Zuhayr/master
...
Species_restricted tweaks
2015-08-22 18:51:19 +02:00
222049dd3c
Merge pull request #10791 from Zuhayr/speciestweaks
...
Species tweaks
2015-08-22 17:50:43 +01:00
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
38a46f7155
Increases placement cells per turf from 16 to 64
2015-08-22 18:06:54 +02:00
9c2cf03e83
Adds bottles for Cola, Space Up and Space Mountain Wind
2015-08-22 18:06:51 +02:00
faae097ce7
Adjusts bar drink recipes
2015-08-22 17:58:15 +02:00
ca4b56cc77
Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits.
2015-08-23 01:24:49 +09:30
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
f1323c35a9
Antags are now never eligible to be patient zero.
...
Includes on-station antags. Fixes #10798 .
2015-08-22 14:38:08 +02:00
8f431c3832
Merge pull request #10801 from mwerezak/movement-cooldown
...
Adds missing TK move cooldowns, fixes #10800
2015-08-22 10:50:13 +02:00
a9f6d01647
Fixes #10800
...
Also does some minor refactoring and removes a duplicate check
2015-08-22 01:55:26 -04:00
bd9b6fd4c6
Merge pull request #10771 from DelZeta/MRGLGRGLGR
...
Fixes permahallucinations.
2015-08-22 05:33:34 +03:00
2e7f94d3b6
Adds the forensic scanner to the list of items armor vests can hold
2015-08-21 20:31:54 -04:00
22b55f755a
Merge pull request #171 from Mark9013100/hatseyecoverage
...
Fixes #166 | Softcaps preventing glasses
2015-08-21 17:26:13 -04:00
8564db4643
I am a fucking moron.
2015-08-22 04:10:44 +09:30
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
PsiOmega