35f534854a
Commented out the AI Announcement verbs
...
Now the AI won't get it's hopes up that it can have the
CAPTAIN REPORT TO THE BAR FOR JOHNSON INSPECTION
2014-02-02 16:57:07 -06:00
d38af0c44b
Typo fix: corpotate -> corporate.
...
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
e72c824b90
Deadchat sanitized so players can't use HTML.
2014-01-31 16:41:12 -06:00
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
ece3556143
Smallfix.
2014-01-31 16:31:17 +03:00
4df59faf76
Surgery tracking.
2014-01-31 16:28:24 +03:00
93a29c60b3
Verb category.
2014-01-31 16:22:31 +03:00
b9b6a6d5be
Check for verb removal.
2014-01-31 00:31:41 +03:00
f208f05534
Merge pull request #4356 from Loganbacca/bayfix-devfreeze
...
Non-standard dropped item layer bug
2014-01-30 10:59:38 -08:00
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
2f36fb79bc
Fixes #4078
2014-01-30 23:31:50 +10:30
8850a43dcb
Fixes #3847
2014-01-30 23:21:00 +10:30
b38e1a71be
Fixes #4223
2014-01-30 22:06:57 +10:30
bc48240fff
Generalized yank_out_object().
2014-01-30 21:56:33 +10:30
eed21f3f5b
Fixes #4355
2014-01-30 21:27:44 +10:30
cbd73c9845
Fix item drop layer bug
...
Similar to the handcuff resisting layer bug.
When removing an item from your inventory that has associated inventory slots, items that were dropped from the extra inventory slots would be dropped with incorrect layer variables (set to 20 so they were rendered over the UI).
Now when the extra items are dropped, it calls the drop_from_inventory() proc, which correctly changes their layer back.
2014-01-30 23:42:21 +13:00
48e4b9a698
Fix handcuff resist - layer bug
...
Fixes #4324
Resisting out of handcuffs was leaving the handcuffs layer set to 20 (over top of the UI).
Changed it to use the drop_from_inventory() proc so it handles the drop event correctly.
2014-01-30 21:35:38 +13:00
a3befe9936
Private message fixes. Stealth-mode / admin != maroon
...
Stealth-Mode Admins won't have their keys show up in the title of private messages anymore (unless the person sending the message is mod+)
Admins PM's to players will show up as red again. You are welcome Virgie!
2014-01-25 22:16:58 -06:00
6da9f68a7a
Merge pull request #4329 from Ccomp5950/gun_fixes
...
Sniper Rifle fixes
2014-01-23 09:07:53 -08:00
8ae4e41aaa
Derp merge deconflict error I made when merging master into dev-freeze.
2014-01-23 01:36:32 -06:00
c028db481e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
2d25c94900
Sniper Rifle Zoom proc documentation comments.
2014-01-22 23:46:05 -06:00
b260d511fb
Gun fixes.
...
You die, you are zoomed out
You have welding equipment on, you can't zoom in.
2014-01-22 23:40:32 -06:00
fbcf162416
Sniper Rifle fix.
...
You have no HUD when zoomed. None, I'm unable to move every HUD element while zoomed in so you lose it. Consider it part of your concentration while zoomed in.
If you move while zoomed in you automatically zoom out, you lose concentration.
If the rifle isn't in your active hand you can't zoom in.
2014-01-22 22:40:21 -06:00
84eefc3b31
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes
2014-01-22 22:39:16 -06:00
e76838bd6e
fix for muting deadme as well.
2014-01-20 22:42:56 -08:00
64e3c3d6b9
Admin requested addition of a global dsay toggle.
2014-01-20 18:27:12 -08:00
0870844898
SMES fix, AI's can now use them.
...
Thinking this was a typo, though quite honestly I'm not sure why this test
is even here as distance checks are built into nanoUI but since feradan put it in
I'm kinda not wanting to remove it.
2014-01-19 21:26:15 -06:00
7f89f602b2
Fixed rad collector toxin drain bug
...
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
2014-01-20 16:16:02 +13:00
04b47fa6a0
Merge pull request #4302 from Ccomp5950/mouse_antagHUD
...
AntagHUD restrictions, disallow players becoming mice.
2014-01-15 22:23:38 -08:00
90ce5b2b69
SPACE2TAB modules/projectiles/guns/energy/special.dm
...
No changes other then space2tab is done in this commit.
2014-01-15 23:42:55 -06:00
039d2d75bf
Merge pull request #4288 from BcTpe4HbIu/master
...
Fix for broken on spawn chem_dispenser
2014-01-15 20:44:57 -08:00
775d75d2f4
Merge pull request #4301 from Loganbacca/bayfix-master
...
Multiple typo and bug fixes
2014-01-15 14:04:10 -08:00
78c032b317
AntagHUD restrictions, disallow players becoming mice.
...
If antagHUD respawn restrictions are enabled, players will no longer be able
to use the "become mouse" verb if they have enabled their antagHUD's.
Observers were able to use antagHUD then become mice and die resetting their "has_used_antagHUD" variable allowing them to respawn bypassing the restrictions by becoming a mouse as well as respawning later.
2014-01-15 03:25:13 -06:00
5827e5a022
Fixes #4296
2014-01-14 15:59:58 +13:00
57a83eae70
Fix for #4194
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-13 14:27:44 +00:00
e25c60f930
Fix for #4289
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-12 23:23:04 +00:00
e826458900
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-01-12 21:55:11 +00:00
a0b909926b
Fix for broken on spawn chem_dispenser
...
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.
Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org >
2014-01-13 00:25:45 +04:00
dc7e32a646
Merge pull request #4271 from Loganbacca/master
...
Plasma glass stacking fix
2014-01-11 19:39:22 -08:00
dfe96b3702
Merge pull request #4260 from Zuhayr/sandwiches
...
Sandwiches!
2014-01-11 19:15:56 -08:00
7a80f02670
Merge pull request #4278 from Faerdan/dev
...
SMES NanoUI
2014-01-11 19:04:18 -08:00
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
1f50cae6c2
SMES NanoUI
...
* Converted SMES to NanoUI.
2014-01-12 01:28:03 +00:00
bd28c0c70b
Merge pull request #4263 from Furlucis/master
...
Talisman icon fix
2014-01-11 07:54:22 -08:00
2dd2ce8ed1
Merge pull request #4262 from Ccomp5950/mouse_runtime
...
Runtime fix for people that jump back in their body before hitting respawn
2014-01-11 07:53:51 -08:00
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
3d34567d56
Merge pull request #4269 from LightningIron/master
...
Bugfixes
2014-01-10 19:28:23 -08:00
cbcd3d1468
Merge pull request #4265 from SkyMarshal/heatfix
...
Heatfix
2014-01-10 18:47:53 -08:00
cbd3f280af
Forgot to include the /spray/ part of the chemsprayer path.
2014-01-10 20:43:27 -06:00
Ccomp5950