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
4efa6b3114
Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
...
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -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
9c68b28425
Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
2014-01-17 17:51:37 +01: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
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
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
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
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
1a58a3cf86
Merge pull request #2265 from fleure/watertank
...
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -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
333d0ed045
Reduced watertank slowdown slightly
2014-01-06 18:26:06 +00:00
fd34cea8ef
fixes the merging failure
...
hopefully that's it
2014-01-05 03:32:10 +01:00
443d6e2d9e
[MAP] Adds Syndicate Borgs
...
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack
All weapons use 100 charge per shot.
2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
f4542ee258
Scattershot ho!
2013-12-30 20:43:10 -08:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
758ca4f81c
Added a failsafe, default_laws is now a config option.
2013-12-23 13:10:04 +01:00
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
df626a1f06
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2013-12-22 11:28:10 +01:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
516ec6076d
Merge pull request #2102 from Razharas/Flamethrower
...
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
9dd0432697
Implements Gia's Superior Idea.
...
fixes some directions on Nienhaus's sprites
2013-12-21 20:09:52 +00:00
b8d8975fe6
Fixes Kaze's Suggestion
...
Standardises the fuck out of Table attackby's (NO COPYPASTA ANYMORE YAY)
Adds a new proc which does the above.
2013-12-21 18:22:49 +00:00
76f9881a42
Cleaning up of AI law datums, adds Custom AI board to the map.
2013-12-21 17:49:50 +01:00
c40af6ae40
Update icons after item is placed in cart.
2013-12-21 09:50:15 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
ae6a4d9b18
Fixes flamethrowers shooting through stuff
...
Fixed #2059
They need to be fixed more, but thats a theme for another PR
2013-12-20 22:57:41 +04:00
61eb26c663
Finalized AI module refactoring. Everything works now.
2013-12-20 19:39:46 +01:00
83b96f0c54
Changes Antimov over to the new AI law system and changes it's path on the map. Various fixes to the new system.
2013-12-20 19:09:39 +01:00
aa655092c5
Major changes & copypasta removal in AI module code.
...
This won't affect gameplay.
(Untested & map won't compile, I want to have the map in a seperate commit)
2013-12-20 17:10:47 +01:00
0fdcd42592
Merge pull request #2054 from Cheridan/Nuke
...
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
89349c0102
Add's IntigAsimov lawset as 'Asimov++'
2013-12-19 20:05:39 +00:00
2988b2b698
Changes Corporate to Kaze's popular Corporate2.
2013-12-19 17:39:25 +01:00
2f70aaadb3
Removes magic numbers and an useless check
...
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
68ff764463
Subtypes of janiborg tools
...
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
7bb4cf6a79
Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles.
2013-12-18 12:25:39 -03:00
b54cab665a
No slipping when lying down
...
- No slipping when lying down
- Doesn’t change slipping mechanics otherwise.
2013-12-18 15:03:03 +02:00
Cheridan
fleure
Razharas
Miauw
Glloyd
Giacomand
Aranclanos
sirbayer
dumpdavidson
VistaPOWA
Robson Richards
Kyrah Abattoir
Perakp