5c40d74aac
Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
...
Conflicts:
code/modules/reagents/reagent_containers/glass.dm
2015-07-04 10:56:27 +03:00
bc2592eb5a
Merge pull request #10222 from MMMiracles/freedomsocks
...
Adds patriotic apparel for upcoming 4th of July (and inferior countries too I guess)
2015-07-04 10:04:46 +03:00
46cab301fc
Added splashing to drinking glasses. Added drinking and feeding to beakers.
2015-07-04 09:44:23 +03:00
2b534cf5aa
- Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.
...
- Removes supply order crates from shuttle loan events. These were pretty unintuitive, as you needed to accept the crates separately.
- Adds a new shuttle loan event: Centcom wants you to help in a virus research program. I feel this is a more controlled way of bringing diseases on the station compared to the disease outbreak event.
- Fixes camera failure event
- Fixes spanish flu, adds spanish flu culture bottle
2015-07-04 01:46:50 +03:00
6299b714f8
-Used Incoming's suggestion to fix the issue instead, by adding a default value to the sanitize_inlist call for tail_human and ears.
2015-07-03 20:55:26 +02:00
f546d13c83
-Fixes pre-existing savegames randomly spawning with cat ears and/or tails.
...
-Fixes the new mutantparts not saving.
2015-07-03 20:18:50 +02:00
bb88dda82b
ERT/DS
2015-07-04 01:38:30 +08:00
2f058bbf37
ArmourPiercingRevolver
2015-07-04 00:26:08 +08:00
7b6867bc21
Merge pull request #10328 from Ikarrus/datumgangs
...
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
a3f5be0b21
HoSArmour
2015-07-03 21:08:21 +08:00
97cff6fc78
Specifies that the 3 value is for the Time argument of animate(), it was already, and did work, but due to animate() being ~funky~ it's kind of hard to read.
2015-07-03 11:50:36 +01:00
1bdae57d30
Merge pull request #10313 from optimumtact/chickychickyrumba
...
Remove taser firing delay
2015-07-03 11:45:49 +02:00
d7289fd34e
Merge pull request #10254 from AlexanderUlanH/saltyseclites
...
Shadowling Update 2: 121% Merge-Ready
2015-07-03 10:55:32 +02:00
54c59a2b42
Merge pull request #10344 from Incoming5643/what_could_pawsibly_go_wrong
...
[Merge for the love of all that's decent in the world] Fixes the CATastrophe
2015-07-03 17:50:36 +10:00
d76d552285
Merge pull request #10327 from MrStonedOne/patch-18
...
Fixes special characters not working in asay/apm
2015-07-03 17:08:35 +10:00
20426cc18d
Fixes the catastrophe: If human mutants aren't allowed in configs they don't have to be tested for roles
...
Additionally the game will properly read a null feature as racially pure.
2015-07-03 03:08:11 -04:00
033650cc47
Cyborg headlamps!
...
- Borg lights are now a screen button.
- Removed all borg flashlight modules.
2015-07-03 01:38:29 -05:00
b1bf4d04fe
Merge pull request #10209 from Ricotez/human_mutantparts
...
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
256f0adeb6
Merge pull request #10280 from optimumtact/securitycamerasreduxion
...
Remove security cameras for real
2015-07-02 22:42:50 -05:00
4d1760ca74
Fixes Beakers unable to transfer their reagents to other objects the mob is holding.
2015-07-02 21:30:01 -06:00
572121ecc4
Merge pull request #10244 from Ikarrus/workplacesafety
...
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
8f8164d8e8
Removed atom var and instead used paramaters to determine the thrower
2015-07-02 19:57:51 -06:00
f0d70a42b0
Rubber Shotgun Pellets
...
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04:00
91728513b6
Fixes clothes not protecting underlaying clothes.
...
It was because the |= operator couldn't be used to fetch the flags while the variable was null. It's set at 0 now.
2015-07-02 17:50:54 -06:00
b563d5fbf4
Added ability for items inside items to have action buttons.
2015-07-03 00:33:02 +01:00
25b134581b
Resolved Conflicts:
...
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
2191a2c33d
Datum-Based Gangs
2015-07-02 15:12:55 -06:00
4af6c0b466
Added drinking glass splashing. Added beaker drinking and splashing which doesn't work at this moment.
2015-07-02 21:26:41 +03:00
4a86be4883
Merge remote-tracking branch 'upstream/master' into boxesofbananium
...
Conflicts:
code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
2c899c84ab
Fixes an indentation error that causes "Tools: X" to repeat in Tablecrafting.
2015-07-02 17:33:11 +01:00
846d3e56c1
MINOR changes to the animation, it's now guaranteed to "smash down" into the victim, where as it was kind of random before (wtf byond?) it's also faster due maintain the same slam/smash effect.
2015-07-02 12:35:50 +01:00
d3e1521214
Changes the effect, the Weapon overlay now fades (to half transparency) and shifts it's pixel_z over the course of the animation. flick_overlay() now uses spawn()
2015-07-02 11:54:45 +01:00
7ba58e834b
Fixes special characters not working in asay/apm
2015-07-01 20:24:52 -07:00
55bec2d24d
Adds a thrownby var that's used by admin logging.
2015-07-01 13:00:12 -06:00
cf921dec58
Merge pull request #10163 from RemieRichards/TableCraftingUnFucking
...
Table Crafting Update
2015-07-01 14:29:55 -04:00
07bf0fd953
You can splash yourself with reagent glasses now
2015-07-01 12:01:58 -06:00
cbf041c054
MATERIAL DATUM
2015-07-01 18:32:30 +01:00
ce02df75f8
Merge pull request #10285 from Ikarrus/gangimplantmania
...
Gang Update: Implants Edition
2015-07-01 18:43:21 +03:00
4eba0b0802
Fixes SNPCs thinking a bullet attack was a melee attack (which obviously causes issues with this system)
2015-07-01 12:43:02 +01:00
9f8a4be5a0
Combat now shows an overlay of the melee weapon used. it appears on screen for 5 ticks (1/2 a second)
2015-07-01 12:00:15 +01:00
3b33a3da9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration
...
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
icons/obj/machines/bignuke.dmi
2015-07-01 19:41:00 +10:00
ae99453a72
Remove taser firing delay
...
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place
In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12:00
f7c7faad06
Merge pull request #10291 from RemieRichards/get_apc()-NotShitVersion
...
Fixes get_apc() being shit
2015-07-01 10:33:12 +02:00
cd36b1665b
Merge pull request #10202 from nullstation/hi-extended
...
HTML interface module: Port of the crew monitoring computer
2015-07-01 05:59:39 +01:00
cfb5e724b6
Material container, all items can have materials, wake me up
...
cant wake up
go to sleep debug
2015-07-01 03:34:47 +01:00
79a41996f5
- Added new confic option: JOIN_WITH_MUTANT_HUMANS
...
- Uncommented all stuff that was commented in the last commit.
- Added a check in front of it that blocks them from showing up in the setup window if JOIN_WITH_MUTANT_HUMANS is not set.
- Included new game_options.txt as an example.
The tgstation server has never used the example game_options.txt so the new config option will not be enabled on it. Even if it did, the option starts commented out in the file.
2015-06-30 23:53:13 +02:00
782fdd7678
Merge pull request #10259 from Razharas/DemonFix
...
Fixes dummy objects being rightclick visible
2015-06-30 23:04:30 +02:00
acd297e7f5
-Added new option to the VV menu drop-down list: Toggle Purrbation.
...
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
3329970b55
Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak
...
Tweaks space drug overdose and space drug blob effect.
2015-06-30 11:02:15 -05:00
7784054999
Added sanity check to disposal climbing
2015-06-30 15:45:48 +02:00
kingofkosmos
Razharas
Perakp
Ricotez
Steelpoint
Cheridan
Remie Richards
Swag McYolosteinen
Jordie
Incoming
GunHog
Ikarrus
Alexander P. Ulan Hernandez
xxalpha
MrStonedOne
WJohn
oranges
phil235
spasticVerbalizer