ea54257ab6
Ported cable coils to stacks crudely
...
Yeah
2014-01-22 02:11:19 +04:00
36ec9cbb6b
Nuke toy no longer uses process and instead uses sleep
...
I don't know what I was thinking with the process, oh well!
2014-01-21 16:52:10 -05:00
0e45022798
Resolved more conflicts with drying rack before being pulled
...
Conflicts:
code/modules/hydroponics/seeds.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
1ff14a5fcf
Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste
2014-01-21 07:38:46 +00:00
c1fa50976b
Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium
2014-01-20 17:48:38 -08:00
013812ddbf
Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops
2014-01-20 15:56:45 -07:00
d90f3bcd6a
Nuke ops no longer get to choose last names. They instead get a code name and the title of Operative(or Commander).
2014-01-20 14:41:12 -07:00
a52678531c
Nuke toy tweaks
...
Made the cooldown noticable
Shortened cooldown to 3 minutes
2014-01-20 15:38:06 -05:00
ad49512b4e
Merge pull request #2440 from Petethegoat/suicideformat
...
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
d6964e703d
Merge pull request #2442 from Alek2ander/master
...
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
8658feae33
Remove adjenct check from click,and move it after attack self
...
Fixed https://github.com/tgstation/-tg-station/issues/761
2014-01-20 10:21:51 +02:00
b8548d273a
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
2014-01-20 05:15:05 +04:00
70e5618cb0
Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
...
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
ecf50f2de8
Goodbye nuke
2014-01-19 22:15:28 +04:00
9fa38637ad
Logs everywhere
...
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
af4849ce72
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-19 16:46:37 +00:00
cd5fb384f0
Merge pull request #2409 from Rolan7/Issue112_Powersinks
...
Fixes Issue 112, APCs not charging
2014-01-18 17:30:02 -08:00
4efa6b3114
Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
...
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -08:00
fe8dba3dc1
Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards.
2014-01-18 20:14:21 -05:00
dc498dc1ea
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
2014-01-18 23:31:51 +04:00
01ce0f5392
Removed copypaste for cyborg metal sheets
...
Fixed typos
2014-01-17 15:45:09 -08:00
d6937897f1
Merge pull request #2399 from Glloyd/master
...
Fixes the back icons for the scythe and the Roman shield.
2014-01-17 15:23:57 -08:00
0dcb8a8042
Fixes borgs and ghosts storages
...
Fixes #2084
2014-01-18 03:23:02 +04:00
f5267c22db
Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full.
2014-01-17 17:21:38 -05:00
9c68b28425
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-17 17:51:37 +01:00
36a346c367
Changes drying rack to use color var and removes "_dry" icons
...
Removed watermelon's dried_state
Puts cigarette reagent code in a proc
2014-01-17 11:26:24 -05:00
b69ab81cc6
Resolves #2213 Fixes the back icons for the scythe and the Roman shield.
2014-01-16 20:23:36 -05:00
574e240649
Merge remote-tracking branch 'origin/master' into inb4gambittraitor
2014-01-16 16:21:46 -05:00
163a6fe0e0
Fixed some stupid snowflake in card attacking
2014-01-16 15:39:06 -05:00
6704a9948d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-16 19:46:04 +01:00
aceb4b22e1
Removed the icon color blend operations from human's update_icons().
...
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
2014-01-16 14:33:50 +00:00
5987de4804
Redo on that merge into master, my bad.
2014-01-15 20:12:52 -08:00
9a562efb35
Update to master (branch was way out of date)
2014-01-15 19:34:35 -08:00
2f90172273
Give mob/living a cloak_stacks list. If there's anything in this list, cloak the mob upon the next update_transform().
...
Give all mob/living/carbon a shared update_transform(). Larva have their own because they're special.
2014-01-15 19:23:57 -08:00
f81ae6fb34
Adds the captain's medal to the medal's lockbox.
...
Fixes issue 2358
2014-01-15 19:10:30 -03:00
11bca59614
Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
...
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00:00
6e55f3e50b
Fixes some issues with rollie paper packs and incorrect icon state names
2014-01-15 16:04:07 -05:00
4dabdc67e2
Fixes #2326
...
- Moves Robotic repair stuff to the two item's respected attack()'s
- Removed them from the human_defense.dm
2014-01-15 16:46:47 +00:00
4404d2462e
Fixing conflicts
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-01-15 09:37:17 -05:00
5a6f29b3d5
Added syndicate playing cards. As a consequence card code now supports multiple deck styles.
2014-01-14 20:24:53 -05:00
03d1396aff
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
2014-01-15 03:56:04 +04:00
b756ddcf92
ops
2014-01-14 10:34:06 +01:00
7de6fa6a87
Removing hrefs from log_game in ghettobomb.dm
...
Fixes #2333
2014-01-14 10:14:56 +01:00
8ed15e8de7
Removing hrefs from log_game in chem_grenade.dm
...
Fixes #2333
2014-01-14 10:14:50 +01:00
93f0817010
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
2014-01-14 03:36:51 +04:00
eb20908dcf
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
2014-01-13 14:08:57 -08:00
0b2a1b7ac4
Merge pull request #2323 from dumpdavidson/empkit_balance
...
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
6d4fe3d08d
Conflict resolve attempt
2014-01-12 03:33:04 +04:00
4948820b67
Gibtonite - Uncommited the .dme changes, fixed countdown(), removed redundant checks
2014-01-11 12:47:30 -08:00
Razharas
JJRcop
Robson Richards
Ergovisavi
KazeEspada
fleure
adrix89
Cheridan
Alek2ander
Pete Goodfellow
Balrog
Hornygranny
Rolan7
Miauw
Glloyd
Giacomand
MrPerson
Aranclanos
Emil
sirbayer