c08cfb8018
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
...
Conflicts:
code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
18098752ac
Gang Tweaks
...
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.
- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
a00e11520c
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-14 15:42:15 -07:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
f992eb1af0
Adds feedback gathering for a hell of a lot more things.
2015-06-09 21:52:46 -07:00
10c60a59b1
adds beam sprites @cheridan merge when???
2015-06-08 19:56:06 -07:00
988ff28734
adds panel open icons for the new buildables
2015-06-07 03:55:28 -07:00
3c1a0dd0d5
SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded.
2015-06-06 12:47:11 -07:00
467cc12ae5
fixes
2015-06-06 00:33:02 -07:00
b65c7a36df
Upgrade Update: Bluespace Boogaloo
2015-06-05 23:56:09 -07:00
1443ee1c75
add icon for chemistry bag
...
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
f79e0fc1aa
Updates more paths, for example obj/stuff to /obj/stuff
2015-05-31 17:48:33 +02:00
84e8690ec6
merge conflict fix
2015-05-31 02:45:46 +02:00
3a826fe13c
Changes alot of datum/ to /datum/
2015-05-31 02:40:54 +02:00
20a28f7d9e
Fixes poppyseed mutating into tomato seeds instead of geranium/lily
2015-05-25 14:48:14 +02:00
3222123a9c
Merge pull request #9579 from SconesC/sweeten-thy-sad-grave
...
Fixes egregious Shakespearean misquote
2015-05-23 13:37:12 +03:00
94814445b4
Fixes minor typo
2015-05-20 18:01:05 -07:00
2b9c8ac98c
fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons
2015-05-17 01:58:46 +10:00
ba20b8a265
Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
...
Resolves #1358 , /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
f3e91beba6
KEEP YOUR HOES IN LINE
2015-05-11 15:58:18 -05:00
e1f5ed793d
Merge pull request #9356 from Firecage/Kudzulogs
...
Adds logs for admins to kudzu.
2015-05-11 23:58:38 +10:00
c6b0c8b390
Investigate logs for kudzu planting
2015-05-11 15:18:01 +02:00
502d21a4da
Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
...
Conflicts:
tgstation.dme
2015-05-10 14:48:35 +10:00
7369992d3d
further reorganization, elimination of old defines folder
2015-05-09 23:16:57 +10:00
279a2653c6
Merge pull request #9347 from SamuelRowe/master
...
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
c8ea983267
More
2015-05-07 11:20:14 +12:00
e2b2ce91e6
Message_Admin() and Game_Log() added
2015-05-05 20:34:25 +02:00
dfaf90c79e
Merge pull request #9264 from phil235/BundleFix6
...
a group of fixes.
2015-05-04 09:41:01 -05:00
be1708483e
- Fixed nettle soup recipe says abstract nettle.
...
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
4a8e168ff3
- admin revive clears addiction list. 8894
...
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
c00def95a6
Fixes a runtime with pod plants, this should fix the unharvestable podplant issue.
2015-04-26 17:30:07 +02:00
de280c72b5
Removed some more spans from visible messages.
2015-04-24 21:06:59 +03:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
e371dd9f35
more spans
2015-04-24 20:52:00 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
Ikarrus
Iamgoofball
Cheridan
phil235
Jordie0608
xxalpha
kingofkosmos
Razharas
Incoming
barackobama
Firecage
phil235
SconesC
Samuel Rowe