Commit Graph

11829 Commits

Author SHA1 Message Date
Ccomp5950
d38af0c44b Typo fix: corpotate -> corporate.
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
Ccomp5950
e72c824b90 Deadchat sanitized so players can't use HTML. 2014-01-31 16:41:12 -06:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
ece3556143 Smallfix. 2014-01-31 16:31:17 +03:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Segrain
93a29c60b3 Verb category. 2014-01-31 16:22:31 +03:00
Segrain
4e17dc0b93 Sanity checks. 2014-01-31 16:21:05 +03:00
Segrain
4c87838e64 Double call removal. 2014-01-31 16:19:22 +03:00
Segrain
b9b6a6d5be Check for verb removal. 2014-01-31 00:31:41 +03:00
Segrain
9fdd34b1ba Removal of double reporting. 2014-01-31 00:28:25 +03:00
Segrain
9a70dd3d13 Objectives fix. 2014-01-31 00:25:44 +03:00
Segrain
75c88634f7 Definition usage. 2014-01-31 00:22:24 +03:00
Ccomp5950
f208f05534 Merge pull request #4356 from Loganbacca/bayfix-devfreeze
Non-standard dropped item layer bug
2014-01-30 10:59:38 -08:00
Ccomp5950
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
Zuhayr
f08e6c804d Rogue comma, kill it. 2014-01-30 23:33:57 +10:30
Zuhayr
2f36fb79bc Fixes #4078 2014-01-30 23:31:50 +10:30
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
851576b444 Fixes #3907 2014-01-30 22:46:48 +10:30
Zuhayr
97442f4727 Adding Kilakk's fix for #4145 2014-01-30 22:31:22 +10:30
Zuhayr
65252e174b Fixes #4089 2014-01-30 22:18:01 +10:30
Zuhayr
a8cdbd939b Discovered/fixed a division by zero error for standing on the supermatter core. 2014-01-30 22:10:44 +10:30
Zuhayr
5039524f90 Fixes #4219 2014-01-30 22:07:20 +10:30
Zuhayr
b38e1a71be Fixes #4223 2014-01-30 22:06:57 +10:30
Zuhayr
bc48240fff Generalized yank_out_object(). 2014-01-30 21:56:33 +10:30
Zuhayr
651599a669 Fixes #4306 2014-01-30 21:35:02 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
Zuhayr
eed21f3f5b Fixes #4355 2014-01-30 21:27:44 +10:30
Loganbacca
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
Loganbacca
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
Zuhayr
91f10583cb Merge pull request #4347 from Ccomp5950/hidden_admin_name_fix
Private message fixes.  Stealth-mode / admin != maroon
2014-01-26 09:15:15 -08:00
Zuhayr
68258a3b1b Merge pull request #4348 from Ccomp5950/rp_revconvert_fix
RP-revconvert bugfix
2014-01-26 09:15:01 -08:00
Ccomp5950
50c077c09f Cryopod icon_state fix.
Missing _ in the icon states.
2014-01-26 01:39:07 -06:00
Ccomp5950
ddca656672 RP-revconvert bugfix
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
2014-01-25 23:36:11 -06:00
Ccomp5950
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
Ccomp5950
bb9a37be8c Adding Cancel options for Adding Verbs. 2014-01-24 23:56:38 -06:00
Zuhayr
19be50cc40 Merge pull request #4333 from Kilakk/master
Fixing #4322, flashes converting people in rp-rev
2014-01-24 18:50:26 -08:00
Kilakk
44962760b8 Removed pointless output
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
2014-01-24 15:04:41 -05:00
Ccomp5950
611a35a6b1 View Variables Option: Add/Remove Verb
Since we can't edit the verbs variable directly this allows us to do so safely.

It builds a list of procs and verbs for the mob type and allows the admin to add it.

Want to add self_destruct to a cyborg?  It will show up in Commands tab
Want to add RevConvert to a regular Rev?  Feel free!

Want to remove whisper from some loud mouth?  Go wild!

Adding procs that aren't usually available to players will create a commands tab, primarily this is for debugging since Advance ProcCall on mobs is awful.

I figured this would be useful when I noticed traitorpanel added RevHeads didn't get their RevConvert verbs and I could find no way of adding it otherwise.
2014-01-24 00:03:00 -06:00
Ccomp5950
26f6964939 Traitor Panel Bugfix: Adds the convert verb to RevHeads made using the traitor panel
Also removes it if you use traitor panel to make them a regular employee using the tator panel.
2014-01-23 21:39:25 -06:00
Kilakk
1a7616fb35 Fixes #4322
* There's probably a much more "modular" way of doing this, but, eh
2014-01-23 20:53:05 -05:00
Chinsky
6da9f68a7a Merge pull request #4329 from Ccomp5950/gun_fixes
Sniper Rifle fixes
2014-01-23 09:07:53 -08:00
Ccomp5950
8ae4e41aaa Derp merge deconflict error I made when merging master into dev-freeze. 2014-01-23 01:36:32 -06:00
Ccomp5950
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
SkyMarshal
8badd4de18 Fixes an error with the explosions-deleting-zone-air detection. 2014-01-22 22:49:37 -07:00
Ccomp5950
2d25c94900 Sniper Rifle Zoom proc documentation comments. 2014-01-22 23:46:05 -06:00
Ccomp5950
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
Ccomp5950
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
Ccomp5950
84eefc3b31 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes 2014-01-22 22:39:16 -06:00
DJSnapshot
e76838bd6e fix for muting deadme as well. 2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9 Admin requested addition of a global dsay toggle. 2014-01-20 18:27:12 -08:00