182e11430d
Fixes chameleon mutation
...
Fixes chameleon mutation
2015-06-29 14:21:06 +03:00
eb4d6c66a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit
2015-06-29 13:42:23 +03:00
ebc6041f9f
Comitterydoo
...
Adds Xhuis' second shadowling fix, along with a slight rework and
expansion of the veil spell.
2015-06-29 03:58:03 -04:00
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
8c1fde7947
Squashed Commits
2015-06-28 22:38:55 -06: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
efcd5f3f75
log simple animal attacks to attack log
2015-06-29 15:24:34 +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
454348759d
Workplace "Accidents"
...
- Slipping while carrying items in your hand may cause ~accidents~
- 30% chance to attack yourself
- 30% chance to attack the floor
- 30% chance to throw the item towards the direction you're facing
- Throwing reagent containers such as drinks or beakers may spill their contents onto whatever they hit
2015-06-28 18:19:11 -06:00
2c9401fbc0
Whoops almost killed the miners with cats
2015-06-28 19:44:44 -04: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
6453882e37
Merge pull request #10 from nullstation/master
...
Merge with upstream
2015-06-28 23:03:23 +02:00
c694febb77
Minimap support for the crew monitoring computer.
2015-06-28 23:00:39 +02:00
bb8471ad3b
Adds a catgirls version of cursed items
...
Apologizes for nothing
:3
2015-06-28 15:27:01 -04:00
224ec328b1
Adds Canada.
2015-06-28 14:15:24 -04: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
58f74302b0
Fixes spawning teams. Maybe.
2015-06-28 14:28:50 +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
5dbd55561d
Adds eating corpses/items.
2015-06-28 11:40:36 +02:00
dcdd122f47
Adds europoor and cyka bylat (WIP) apparel to appeal to the inferior masses. assblastusa.
2015-06-28 05:11:32 -04:00
f534e3c0ec
Merge pull request #10200 from Jordie0608/whoevenusesthese
...
Fixes Cheridan being a dork
2015-06-28 02:27:33 -05:00
9097c25cb9
Adds patriotic apparel for upcoming 4th of July. ASSBLASTUSAUSAUSA.
2015-06-28 03:09:55 -04:00
a6ce6abfe3
Merge pull request #8 from nullstation/master
...
Merge with upstream
2015-06-28 07:09:40 +02: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
84231643c5
-Humans with tails and/or ears are considered not entirely human, and locked out of important positions.
2015-06-27 22:51:07 +02: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
b8811f23e0
-Added two new types of mutant accessories for humans: tail_human and ears. These ears are considered mutant parts and don't override normal human ears.
...
-Added one ear and one tail accessory to these categories, obtained from the kitty ears. The ears are obviously cat ears, but the tail can pass for a monkey tail without ears.
-Humans can now also edit alien/mutant colours. They have access to the full range of colours, but if the player switches back to lizard and the colour is too dark, it'll be reset to the default.
-Renamed the original tail to tail_lizard. All references are properly updated and nothing has to be changed.
-Could not solve an annoying bug with the setup window, where a lizard tail is rendered whenever a human tail is set. This problem only exists in the setup window and does not affect the sprite in-game.
2015-06-27 20:57:54 +02:00
dc9b7f4496
Merge pull request #10184 from Razharas/DatumCrafting
...
Fixes telesci console icon
2015-06-27 20:33:21 +02:00
e12bc89fb0
Un-bashes goofball
2015-06-27 19:06:38 +01:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
db5a0109d6
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine, buffs nicotine slightly.
2015-06-27 18:04:43 +01: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
b977ea8be6
Merge branch 'hi-extended' of https://github.com/nullstation/-tg-station into hi-extended
2015-06-27 10:56:58 +02:00
3ac02c82e5
Fix for the "Populate world" verb.
2015-06-27 10:56:35 +02:00
Razharas
Alexander P. Ulan Hernandez
Jordie
Ikarrus
Orange Borg
Incoming5643
Cheridan
xxalpha
nullquery
Incoming
MMMiracles
phil235
AnturK
Razharas
barackobama
MrStonedOne
Ricotez
phil235
Dorsisdwarf
LaharlMontogmmery