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
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
suethecake
6f69e7f821
Stuff.
2014-01-29 18:15:35 -06:00
Zuhayr
a2fa476182
Compile fix.
2014-01-29 16:41:59 +10:30
Zuhayr
a8346c76d7
Hacky fix for appendicitis in vox/diona/machines.
2014-01-29 16:06:02 +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
Zuhayr
5d02779d16
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:15 +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
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
Zuhayr
1fce280da8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-26 20:07:02 +10:30
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
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
4ca429fdf3
Actually allowing tiny objects on ears
2014-01-25 13:06:22 +01:00
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
RKF45
0bf042e64a
Only costumes that have sprites belong in the crate
2014-01-25 11:56:27 +01:00
Ccomp5950
bb9a37be8c
Adding Cancel options for Adding Verbs.
2014-01-24 23:56:38 -06:00
Ccomp5950
6830ebadc9
Merge pull request #4332 from Faerdan/dev
...
NanoUI Gas Cooling/Heating System
2014-01-24 18:52:12 -08: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
Ccomp5950
14c2e3f612
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
2014-01-24 20:38:29 -06:00
