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
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
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
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
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
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
4404d2462e
Fixing conflicts
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-01-15 09:37:17 -05: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
646df06cf9
moved when the emp_act is called in the afteratack proc of the emp flashlight
...
using absolute paths everywhere now.
adds a backslash to prevent "The the flashlight..."
2014-01-11 21:40:15 +01:00
cf672d2c29
Balance changes to the EMP kit:
...
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)
- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
cb0516f909
Corrected my own grammar failings.
2014-01-11 12:51:42 -05:00
0afe5c982d
merging upstream master into local repo
2014-01-11 17:14:48 +01:00
671b49cba1
Fixes the double-energy draw of the esword, makes the syndicate icon properly display for the borg.
2014-01-11 17:04:17 +01:00
c1d228a96e
Merge pull request #2282 from Cheridan/Magic
...
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
7b5e401ee6
Merge pull request #2275 from JJRcop/nuke-toy
...
Adds new nuke toy
2014-01-11 04:22:20 -08:00
c10d9b2611
fixing my fixes
2014-01-10 14:10:30 -06:00
397b2f07e8
fixes
2014-01-08 10:42:12 -06:00
0ef530326a
Minor nuke toy edit
...
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
2014-01-08 09:52:00 -05:00
f98a57b750
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
937ac275ff
Upgradeable Laser Pointers!
...
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
2014-01-07 19:54:51 -06:00
8feb37969e
More dead colons and pipes use their initial name when changing it
2014-01-07 20:49:13 -05:00
01f229a60d
Adds "surround" arg to playsound, which enables 3D sound
...
Defaulted to on
Also changes the toy nuke to use it
2014-01-07 17:45:12 -05:00
b82af39ed1
dds Drying Rack, Various Plants, Rollies, Pipes, and Torches
...
Any and all content credit to @Adrinus and @Iamgoofball
I simply re-applied all the changes by hand so it is compatible with current code
#1893
2014-01-07 15:40:49 -05:00
67e37bd449
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
...
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
code/modules/research/designs.dm
maps/tgstation.2.1.2.dmm
2014-01-07 18:18:59 +01:00
afd6b5fa22
Merge pull request #2266 from fleure/janradio
...
Gives janitor service headset
2014-01-07 08:37:24 -08:00
1300e3ebf3
Adds a visible_message to the nuke toy when it is used
2014-01-07 11:20:19 -05:00
1a58a3cf86
Merge pull request #2265 from fleure/watertank
...
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
9602bd2c14
Merge pull request #2256 from Aranclanos/RRpls
...
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
45cb745b6b
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
...
Conflicts:
code/modules/projectiles/guns/magic.dm
2014-01-06 17:59:15 -08:00
58159a00ad
Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
...
Poker tables
2014-01-06 14:35:03 -08:00
94ef52e1cd
Adds new nuke toy, plays nuke sound when attack_self'd
...
Cooldown of 5 minutes
2014-01-06 16:46:12 -05:00
c50255107a
Gives janitor service headset
2014-01-06 18:51:22 +00:00
JJRcop
fleure
Cheridan
Alek2ander
Pete Goodfellow
Hornygranny
Razharas
Rolan7
Miauw
Glloyd
Giacomand
Aranclanos
sirbayer
dumpdavidson
YotaXP
VistaPOWA