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
Ccomp5950
9f0792ac1a
Merge pull request #4352 from Zuhayr/dev
...
Species changes and icons.
2014-01-30 09:37:15 -08:00
Zuhayr
8850a43dcb
Fixes #3847
2014-01-30 23:21:00 +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
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
a2fa476182
Compile fix.
2014-01-29 16:41:59 +10:30
Zuhayr
2703333312
IPC tweaks.
2014-01-29 16:05:43 +10:30
Zuhayr
4a0fb22530
IPC brain surgery code.
2014-01-29 16:01:25 +10:30
Zuhayr
f3d0efea87
IPC feeding from APCs, IPC lack of reagent processing.
2014-01-29 15:37:08 +10:30
Zuhayr
66173043b1
Actually applied nymph speech and name change.
2014-01-29 04:35:44 +10:30
Zuhayr
9301c72933
Fixing case on some del() calls.
2014-01-29 04:31:38 +10:30
Furlucis
0f8b1b09ab
Small borer fix
...
Someone forgot an exclamation point and made the check for a lack of
brain check FOR a brain, making the assume direct control thing not
work.
2014-01-28 00:32:39 -05:00
Zuhayr
c0b91504b4
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
2014-01-28 15:59:50 +10:30
Zuhayr
ae7ae5a837
IPC hairstyles.
2014-01-28 15:58:26 +10:30
Ccomp5950
16904ec5ec
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:09 -06:00
Chinsky
6da9f68a7a
Merge pull request #4329 from Ccomp5950/gun_fixes
...
Sniper Rifle fixes
2014-01-23 09:07:53 -08:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -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
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
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
RKF45
5a9e8e0f30
Fixes for emagging robots
2014-01-19 12:16:10 +01:00
Ccomp5950
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
Mloc
57a83eae70
Fix for #4194
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-13 14:27:44 +00:00
Mloc
e25c60f930
Fix for #4289
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-12 23:23:04 +00:00
Ccomp5950
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
Zuhayr
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
Ccomp5950
bc6561b9e4
Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes.
...
Who does that? People that cause runtimes, that's who!
(Jerks)
2014-01-10 15:59:40 -06:00
Mloc
6f01e97161
Merge pull request #4248 from Zuhayr/dev
...
Dionaea changes (microwave recipe, holder procs) and resist verb.
2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3
Merge pull request #4252 from RKF45/ears
...
Tiny objects on ears
2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f
Merge pull request #4244 from LightningIron/master
...
Ninja bugfixes/minor code cleaning/energy cost changes
2014-01-10 13:42:42 -08:00
Mloc-Argent
4c1e17649e
Merge remote-tracking branch 'upstream/master' into dev
2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
Zuhayr
38f47f5ae1
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
RKF45
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
RKF45
c47be94b42
Removes braindeath as IC term
2014-01-09 21:49:21 +01:00
Zuhayr
906768070f
Resolved custom_items.dmi.
2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
LightningIron
8c26c23157
Merge remote-tracking branch 'upstream/master'
2014-01-09 11:15:26 -06:00
Zuhayr
d3d6294ab0
Compile fix, ugh.
2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286
Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
2014-01-10 01:58:22 +10:30
Zuhayr
35d8219bb6
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
2014-01-09 23:57:20 +10:30
Zuhayr
943554242a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-09 23:53:34 +10:30
Zuhayr
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
ZomgPonies
09c56a0930
BS12 compile fixes for Constructs
2014-01-09 04:49:16 -05:00
