Razharas
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
hornygranny
0b5e182a83
Merge pull request #6232 from Incoming5643/happykwanzaa
...
Don't they know it's christmas time at all?
2014-12-13 22:57:19 -08:00
Razharas
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
paprka
32038f1afa
revert jumpsuit armor changes
2014-12-13 00:38:31 -08:00
paprka
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
tkdrg
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
paprka
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
paprka
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
paprka
250bbd7f4d
fixes bug with a sec uniform, buffs engie hardsuits
2014-12-11 17:35:10 -08:00
Hornygranny
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
paprka
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
Cheridan
05f5a1223d
Merge pull request #6131 from paprka/injurydoll
...
Health doll, UI improvements
2014-12-11 12:42:06 -06:00
Cheridan
3ede77face
Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
...
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
Cheridan
91d6fb38b9
Merge pull request #6245 from tkdrg/hudwhyyoudothistome
...
/datum/atom_hud (Passive HUDs) bugfixes
2014-12-11 08:39:12 -06:00
Razharas
f9cf4f233d
Merge pull request #6263 from paprka/gunsthegunnening
...
Guns: the gunnening
2014-12-11 10:46:34 +03:00
paprka
b65df8425f
trims some unnecessary code
2014-12-10 22:56:52 -08:00
Cheridan
e3016f582d
Merge pull request #5956 from RemieRichards/SpaceNooneHearScreams
...
In space, no one can hear you scream
2014-12-10 17:43:32 -06:00
Hornygranny
99f364f480
makes APC call parent
2014-12-09 18:53:29 -08:00
Hornygranny
72132b1bf1
fixes whitespace
2014-12-09 16:32:16 -08:00
Hornygranny
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
Cheridan
347e7ecf9d
Merge pull request #6135 from Menshin/species_radiation_processing_fix
...
Fixes radiation levels processing for aliens, brains and monkeys
2014-12-09 09:31:31 -06:00
Cheridan
a7c2b14d83
Merge pull request #6159 from optimumtact/halfthecake
...
Removed nearly all move penalties while in space
2014-12-09 08:46:54 -06:00
Razharas
cc8c221fab
Merge pull request #6257 from as334/Slimes
...
Add's more stuff for Xenobiology and slimes
2014-12-09 06:44:12 +03:00
paprka
f917bd2906
fixed some double periods
2014-12-08 19:13:44 -08:00
paprka
b01e6ba882
Generic names and buffs
2014-12-08 16:49:48 -08:00
Razharas
d61ecfa324
Merge pull request #6181 from GunHog/Autosay_Fix
...
Lets AI and Borgs control radio behavior for auto announcements.
2014-12-09 01:16:48 +03:00
GunHog
b9531ad5e7
[r] -> [radiomod]
...
Just changes instances of [r] to [radiomod]. No functional changes.
2014-12-08 15:40:45 -06:00
tkdrg
e2c15d5210
Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome
...
Conflicts:
code/modules/hydroponics/hydroponics.dm
2014-12-08 13:48:22 -03:00
Swag McYolosteinen
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
paprka
bcf6fe2a69
adds c90 and bulldog to summon guns, fixes 40mm flames
2014-12-08 02:04:32 -08:00
paprka
94c5ea931d
functional grenade launcher shooting
2014-12-08 01:22:27 -08:00
paprka
d082cdd383
commit for grenade launcher moving
2014-12-08 00:30:10 -08:00
Swag McYolosteinen
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
paprka
c158599253
Christmas santa hats!
2014-12-07 20:02:03 -08:00
paprka
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
as334
766780ca98
Testing if git has unfucked.
2014-12-07 22:17:41 -05:00
as334
f3e2c2d1f9
Add's feedback, changes plasma usage.
2014-12-07 21:35:52 -05:00
Razharas
5a78aa83be
Merge pull request #6225 from NecroticBinder/Clean_Slime_Fix
...
Clean slime fix
2014-12-08 04:31:58 +03:00
as334
7b05f3962b
Fixes chem reactions
2014-12-07 16:42:37 -05:00
as334
f21e9d0a6b
Adds neat slime stuff
2014-12-07 16:20:31 -05:00
Swag McYolosteinen
609807df75
Merge pull request #6199 from Ergovisavi/less_terrible_human_plants
...
Pod Cloning changes
2014-12-07 17:34:54 +01:00
Ergovisavi
e581a3ff8f
Commiting changelog for new replica pod behavior
2014-12-07 05:13:54 -08:00
Remie Richards
b4c5b7348d
Merge pull request #6222 from phil235/SaltShakerFix
...
Fixes saltshaker icon when adding salt to a condiment bottle.
2014-12-06 23:57:29 +00:00
tkdrg
3e97e935af
/datum/atom_hud (Passive HUDs) bugfixes
...
Moves antag_hud image and datum to mind instead of mob.
Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.
Fixes #6206
Fixes #6209
2014-12-06 15:05:23 -03:00
Swag McYolosteinen
6f5b2cf7ea
Merge pull request #6224 from fleure/gargleblaster
...
Changes Gargle Blaster description
2014-12-06 10:28:23 +01:00
paprka
953bffd23b
compile error fix
2014-12-05 21:27:52 -08:00
paprka
0f3f0659d1
coats to lockers, winter boots
2014-12-05 21:14:49 -08:00
Razharas
6fb548b283
Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit
...
Fixes mobs getting moved on the escape pods when buckled
2014-12-06 07:42:12 +03:00
paprka
1a591f06e7
c90gl improvements for code, added grenade launcher as a stand-in for now
2014-12-05 20:20:45 -08:00
paprka
481fffcb08
second commit for c90gls
2014-12-05 18:13:04 -08:00
