Zuhayr
f1b77d0ed6
Master merge.
2014-02-05 18:34:23 +10:30
Iamgoofball
2ec805630e
Because we HAVE to define Del() three times
...
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
/obj/item/device/gps/Del()
GPS_list.Remove(src)
..()
2014-02-04 11:30:35 -08:00
Chinsky
e7c22c28c7
Merge pull request #4379 from Segrain/master
...
Smallfix.
2014-02-04 01:44:32 -08:00
Segrain
4b8d5c4f14
Code cleanup.
2014-02-04 08:16:06 +03:00
Chinsky
9a4bcc60b4
Merge pull request #4377 from Ccomp5950/ai_announcements_tease
...
Commented out the AI Announcement verbs
2014-02-02 23:30:55 -08:00
Segrain
83246df6d5
Fix for #4297 .
2014-02-03 07:32:53 +03:00
Segrain
9ff5776c9f
Pepperspray safety.
2014-02-03 05:10:04 +03:00
Segrain
1039fc9eaf
Spray sizes.
2014-02-03 05:08:08 +03:00
Segrain
6af8f01cab
Code cleanup.
2014-02-03 05:00:15 +03:00
Segrain
4fe85651b6
Taperolls for cyborgs.
2014-02-03 04:46:47 +03:00
Segrain
fcc4560e92
Displaying delayed time.
2014-02-03 04:38:38 +03:00
Segrain
b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
Ccomp5950
3a54d96b7a
Merge pull request #4374 from Loganbacca/bayfix
...
Broken heart fix
2014-02-02 17:22:25 -08:00
Ccomp5950
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
Loganbacca
70a1c768ad
Broken heart fix
...
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.
Thanks to the guys from Paradise for finding this.
Note: this only fixes literal heart problems, it won't do anything for relationship issues.
2014-02-03 00:28:15 +13:00
Ccomp5950
0980493981
Merge pull request #4368 from Loganbacca/prefs
...
Character setup underwear rendering
2014-02-01 14:58:38 -08:00
Ccomp5950
d38af0c44b
Typo fix: corpotate -> corporate.
...
And superfluous U removal 'MURIKA!
2014-02-01 15:25:00 -06:00
Zuhayr
e79fb1d890
Merge pull request #4366 from RKF45/dough
...
Reintroducing the dough-based cooking system.
2014-02-01 05:13:10 -08:00
Chinsky
3a913e426c
Merge pull request #4360 from RKF45/dev
...
I am doing that just for genetecists wearing monkey suits.
2014-02-01 03:33:54 -08:00
Chinsky
79fd66c685
Merge pull request #4364 from Loganbacca/collars
...
Suit collars
2014-02-01 03:30:36 -08:00
RKF45
4b6dc4d257
Diona roasts needs cooperation for acid
2014-02-01 11:16:55 +01:00
Loganbacca
6bf6f6d849
Added underwear rendering to character setup screen
...
Also culled unused underwear names from global_lists.dm
2014-02-01 17:53:13 +13:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
Loganbacca
44498dc5eb
Tail rendering fix
...
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
2014-02-01 13:30:18 +13:00
Loganbacca
c6964b1a1a
Cleaned collar rendering code
...
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define
2014-02-01 13:25:09 +13: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
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
