87cd31c11f
Merge pull request #10211 from Ikarrus/burntweaks
...
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
47b1deb528
Merge pull request #10204 from Razharas/VarEdit
...
Some varedit improvements
2015-06-29 19:18:28 +02:00
588c12ee22
Merge pull request #10219 from xxalpha/mouthgag
...
Fixed not being able to eat with adjusted masks.
2015-06-29 18:23:56 +02:00
a8bc78e16e
Merge pull request #10125 from Iamgoofball/patch-85
...
Buffs the traitor toxins
2015-06-29 17:36:11 +02:00
a39effd14c
Merge pull request #10193 from Cheridan/what_a_fluke
...
Suit Sensor Fixes
2015-06-29 17:32:44 +02:00
eb4d6c66a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit
2015-06-29 13:42:23 +03:00
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
77a77dd107
Jetpack speed changes [DNM]
...
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)
The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
4dbb5feb2d
If ex_act(2) is softened by armor, shredding chance gets halved
2015-06-28 20:29:13 -06:00
4f4b8f1774
Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06:00
48dedda36b
ABSTRACT items cannot be shredded
2015-06-28 18:55:34 -06:00
5fc029d63d
Merge pull request #10215 from Ikarrus/freetheclothes
...
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
2015-06-28 18:16:04 -05:00
0ab6b99658
Flag cleaning.
2015-06-29 00:08:49 +01:00
6c0a930cfb
Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
...
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
47f3d802f6
Fixed not being able to eat with adjusted masks and helmets.
2015-06-28 23:51:55 +01:00
d07e315ddf
Squashed
2015-06-28 12:11:05 -06:00
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
c1a37bb2e0
Derp, I hate fixing merge conflicts...
2015-06-28 15:27:58 +02:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
98c2bd18db
Merge pull request #9620 from xxalpha/mineralcontainer
...
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
7dfcc292b7
add a variable to mmi to indicate if it's of the syndicate variety as
...
suggested
2015-06-28 12:44:25 +01:00
f534e3c0ec
Merge pull request #10200 from Jordie0608/whoevenusesthese
...
Fixes Cheridan being a dork
2015-06-28 02:27:33 -05:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
1a5be75225
Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner
...
Admin help tweaks.
2015-06-28 02:55:53 +03:00
9a64d1db9e
Removes duplicate variable in adminhelp.
2015-06-27 16:49:39 -07:00
8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
d9da2290e8
Cleans up adminhelp keyword searcher and changelog for #10196 .
2015-06-27 13:03:47 -07:00
7894263033
Destructible Clothing Tweaks
...
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
2015-06-27 13:33:33 -06:00
dc9b7f4496
Merge pull request #10184 from Razharas/DatumCrafting
...
Fixes telesci console icon
2015-06-27 20:33:21 +02:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
6ab2eb78e0
Merge pull request #10155 from Ikarrus/shredme
...
Burnable Objects & Clothes [Ready]
2015-06-27 18:29:14 +03:00
59ca40f03d
Burning objects are processed every tick now instead of using a spawn() check
2015-06-27 09:22:14 -06:00
3d556ea970
Some varedit improvements
...
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
2015-06-27 18:00:57 +03:00
5e27cc1fec
fixes syringe filling with < 3 volume
2015-06-27 20:49:37 +10:00
e6602cf123
Merge pull request #4 from tgstation/master
...
Merge with upstream
2015-06-27 10:27:43 +02: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
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
0d0f1a5f0d
fixes dropper sprite
2015-06-27 15:25:58 +10:00
40a90ab8df
ayy lmao merge conflicts
2015-06-27 00:02:46 -05:00
50c1fc487e
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-26 23:49:43 -05:00
16cdc39d2f
Converts the jacket to a cosmetic, added to autodrobe and clothesmate, doesn't spawn in closets anymore
2015-06-26 23:48:18 -05:00
e6ffb1a922
Fix for playing cards on systems with IE8
2015-06-27 05:51:59 +02:00
1aac98a52a
Merge pull request #3 from tgstation/master
...
Merge with upstream
2015-06-27 05:01:13 +02:00
46d7fb9bbd
Merge pull request #10168 from phil235/FireaxecabinetFix
...
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
0aeffb3c0f
Admin help tweaks.
...
The keyword scanner (thing that adds (?) links to player names in admin helps) has been moved to its own proc.
This has been added to all admin pms.
It has been added to asays as well, with the (FLW) link removed to avoid it being distracting.
Replying to an admin help (but not other forms of admin pms nor admin pm replies) by clicking on the name of the ahelper will now send a message to all admins letting them know you are typing up a reply to it. (this should avoid mutiple people replying to the same ahelp) (It also sends a message if you escape out of the ahelp reply as well)
2015-06-26 16:30:37 -07:00
f06abf3e2f
fixes compile error
...
One pr added a path to an item(#10018 ) but another pr changed that path(#9932 ).
2015-06-26 16:06:37 -07:00
d493cc37b3
also makes the code compile i'm so nice
2015-06-26 17:43:17 -05:00
9f95965abf
Suit Sensor Fixes
...
-Chameleon jumpsuit sensors now start off
-Fixes unreported(?) bug where prisoner jumpsuits would start randomized when they are supposed to be always-on.
2015-06-26 17:15:19 -05:00
Cheridan