89aa07fdf9
Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites.
2015-05-10 00:40:13 -05:00
7e8a173fd4
Adds 7 new AI core sprites.
2015-05-09 18:02:30 -05:00
6618b225a0
Made sterile gloves actually start sterile
...
Fixes #9163
2015-05-09 22:10:39 +03:00
95aef467a0
Magboots can be worn over shoes
...
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
2015-05-09 14:20:03 -04:00
027275a7cb
Re-adds click cooldowns to trays and vines
2015-05-09 20:53:00 +03:00
9fadad7b33
Player age now displayed also in notes
2015-05-09 19:33:11 +03:00
84696567d8
Ability to select job equipment in 'Select Equipment'
2015-05-09 19:29:26 +03:00
3fa79f8d51
Removes click cooldowns almost everywhere.
...
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
be91976e30
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-09 11:13:05 +02:00
fedd0342a0
Minor chem fixes
2015-05-09 12:03:22 +03:00
2a53f6bf6d
Merge pull request #9153 from Techhead0/rlimb_data-fix
...
Fixes rlimb assignment for hands/feet in chargen
2015-05-09 10:00:10 +02:00
e368c78b42
Fixes rlimb assignment for hands/feet in chargen
...
An easy fix for a small typo that caused rlimbs not to be assigned to
second_limb (hands/feet). I'm surprised the bug went unnoticed this
long.
2015-05-08 21:12:15 -04:00
513579b8ac
Merge pull request #9140 from PsiOmegaDelta/Accounting
...
Fixes #9139 .
2015-05-08 19:41:57 +03:00
b98461c2af
Station alarm monitor changes.
...
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
2015-05-08 11:22:29 +02:00
999b0ca99d
Compilation fixes.
2015-05-08 08:33:41 +02:00
28d24fc8c6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/atmos_control.dm
code/game/machinery/telecomms/logbrowser.dm
code/modules/mob/mob_helpers.dm
2015-05-08 08:23:15 +02:00
a36acc8eba
Merge pull request #9136 from GinjaNinja32/CyborgIsNotAI
...
Fixes cyborgs showing up as AIs in radio output for AIs.
2015-05-07 23:23:54 -04:00
c1350e8df8
Merge pull request #9101 from StarSmasher44/patch-3
...
Applies Icon Caching to battery racks, Fixed edition
2015-05-07 23:20:30 -04:00
72dc583ef5
Fixes #9139 .
...
Arranges the order at which starting funds is set and account creation is done.
2015-05-07 19:23:56 +02:00
cec16d7559
Fixes cyborgs showing up as AIs in radio output for AIs.
...
Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same.
2015-05-07 14:48:18 +01:00
d7e5792f98
Ensures dionaea nymphs respect antagHUD restrictions.
2015-05-07 13:28:35 +02:00
783e437c5e
Enforces antagHUD restrictions.
...
antagHUD checks were missing in a few places.
Can no longer join as drone, ERT member, or pAI if you have enabled antagHUD.
2015-05-07 09:55:26 +02:00
7cbd72d1be
Cleanup.
2015-05-07 09:09:12 +02:00
10edb06036
Do not copy-paste code.
...
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
9e4dacc765
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/machinery/machinery.dm
code/game/objects/items/weapons/storage/misc.dm
code/game/response_team.dm
html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02:00
f3dd96bb8c
Adjusts charge costs for gun/energy
...
In particular, charge costs were chosen so that mounted energy guns
drain 80% of a default rig's power cell in 40 shots, and mounted laser
cannons drain the same in 20 shots.
2015-05-07 00:13:21 -04:00
3e1e137cec
Adds device powercells
...
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
2015-05-06 23:41:57 -04:00
f2b4543ba6
Merge pull request #9113 from PsiOmegaDelta/AntagOOCRights
...
Ensures only antags and admins can see AntagOOC.
2015-05-06 17:30:58 -04:00
af7ec5c8ad
Merge pull request #9099 from StarSmasher44/patch-2
...
Adds Icon Caching for some Mob HUD Icons
2015-05-06 19:01:20 +03:00
d0c2b883aa
Merge pull request #9069 from RavingManiac/dev
...
Muzzle-flash lighting effect for guns
2015-05-06 17:27:21 +03:00
4602bd033f
Fixes #9106 .
...
Now only carbons can be given items, as intended.
2015-05-06 15:41:39 +02:00
b6501998e3
Ensures only antags and admins can see AntagOOC.
...
Adds rights check, not only holder verification.
2015-05-06 11:34:54 +02:00
7436573177
Fixes the removal of all organs when admins use "Select Equipment"
...
fixes #8884
2015-05-05 21:37:28 -04:00
024dabef7b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-05 22:13:58 +02:00
4afe2e46e6
Updates code based off of GinjaNinja's Feedback
2015-05-05 17:16:10 +02:00
2675bac50e
Applies Icon Caching to battery racks, Fixed edition
...
I did a whoops, should be good now, I hope.
2015-05-05 16:50:23 +02:00
2a96210223
Fixes this one at least.
2015-05-05 16:47:40 +02:00
82b810d363
Revert "Applies Icon Caching to battery racks"
2015-05-05 15:36:19 +01:00
b27dbdaaf5
I'm too broken for this
...
Also fixes this one, probably.
2015-05-05 14:21:28 +02:00
b6b3548760
I'm too broken for this
...
Should work now.
2015-05-05 14:20:35 +02:00
1c9dbfdb2b
Removes unneeded variable
...
All good now.
2015-05-05 14:13:26 +02:00
f69358d4f5
Removes unneeded variable
...
Thanks Psi for pointing that out.
2015-05-05 14:12:03 +02:00
b03d5a7850
Adds Icon Caching for some Mob HUD Icons
...
Adds partial caching for some of the smaller HUD additions of the mobs to allow for less processing needed to constantly update the icons when needed.
Code has been tested on a live server for several weeks prior to it's shutdown, so it should work as great as it has worked for us.
2015-05-05 14:04:53 +02:00
89b65e216f
Applies Icon Caching to battery racks
...
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.
Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
2015-05-05 13:12:52 +02:00
80467f8fa6
Removes metorapan reaction
2015-05-05 12:01:02 +03:00
1fc76bcb9b
The examine tab now lists the available pen commands.
2015-05-05 09:03:43 +02:00
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
151c5204ee
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/modules/projectiles/gun.dm
html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
e0a903d9eb
Merge pull request #9093 from Baystation12/master
...
Master->Freeze
2015-05-05 01:42:57 +03:00
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
MrSnapwalk