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
Loganbacca
41dccddbef
Suit collars
...
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm
Trenchcoats are go!
2014-02-01 02:17:52 +13:00
Ccomp5950
8c5c5fb868
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-31 06:26:20 -06:00
RKF45
2be33b8713
Typo
2014-01-31 08:36:56 +01:00
Segrain
b9b6a6d5be
Check for verb removal.
2014-01-31 00:31:41 +03:00
RKF45
003dd117f2
New preferences
2014-01-30 22:27:47 +01: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
f136fa1db2
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
icons/mob/mask.dmi
2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/supermatter/supermatter.dm
maps/tgstation2.dmm
2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d
Merge pull request #4358 from SueTheCake/armors
...
Tactical Armor Storage + Tac Armor REDUX
2014-01-30 10:33:46 -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
Ccomp5950
9f0792ac1a
Merge pull request #4352 from Zuhayr/dev
...
Species changes and icons.
2014-01-30 09:37:15 -08:00
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
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
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
suethecake
6f69e7f821
Stuff.
2014-01-29 18:15:35 -06: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
69d260a11d
Preliminary surgery work for IS_SYNTHETIC.
2014-01-28 16:00:36 +10:30
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
Zuhayr
9d7b42f6b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:42 +10:30
Chinsky
ada2ba9a2f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
...
Conflicts:
code/modules/power/cable.dm
icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Zuhayr
84b3512261
Merge pull request #4345 from RKF45/misc
...
Fixes for my earliest commits
2014-01-26 09:16:07 -08:00
Ccomp5950
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08: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
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
Ccomp5950
14c2e3f612
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:29 -06:00
Ccomp5950
16904ec5ec
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:09 -06:00
Zuhayr
98177f5a33
Compile fix for what I think was a botched merge with Chemistry-Machinery.dm.
2014-01-25 03:18:48 +10:30
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Loganbacca
867d0d6967
Areas added to powernets again
...
Fixes #4328
New z-level code wasn't handling d1 == 0 cables correctly.
2014-01-24 17:26:33 +13:00
Chinsky
6da9f68a7a
Merge pull request #4329 from Ccomp5950/gun_fixes
...
Sniper Rifle fixes
2014-01-23 09:07:53 -08:00
Ccomp5950
3d44e909bd
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 01:39:10 -06:00
Ccomp5950
8ae4e41aaa
Derp merge deconflict error I made when merging master into dev-freeze.
2014-01-23 01:36:32 -06: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
