566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
0976cde773
updates ian so he can use civillian armor instead of sec armor
2014-12-17 18:13:24 -08:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
a6e12c2ea9
warden bug, warden belt, backpacks
2014-12-17 09:19:04 -08:00
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
c021bda843
Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
...
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
672b476f23
Tidying a little
2014-12-16 13:16:19 +01:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
d4c2cc3b64
MapChanges/ArmourSpriteChanges
2014-12-16 11:48:06 +08:00
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
4ceaa597ab
Merge pull request #6385 from phil235/UsedSlimecoreFridgeFix
...
Fixes not being able to remove used slime extract from smartfridge
2014-12-15 16:28:39 -08:00
5dd86ab53d
Merge pull request #6370 from Xhuis/monkeying_around
...
Fixes monkeys being able to read books
2014-12-15 16:27:51 -08:00
a9e3edbffe
Merge pull request #6359 from phil235/SlimeAttackSlimePeopleFIx
...
Fixes Slimes attacking slime people.
2014-12-15 16:26:26 -08:00
f96f222c18
Merge pull request #6358 from tkdrg/demplatings
...
Fixes being able to turn asteroid into normal turf
2014-12-15 16:25:45 -08:00
51e10e6a19
Fixes controless tracker runtime
2014-12-16 01:23:29 +01:00
1519e320ee
Merge pull request #6357 from tkdrg/funtimes
...
Fixes two runtimes
2014-12-15 10:05:38 -08:00
0864822177
Part1TestingTheWaters
2014-12-15 18:41:33 +08:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
753202d008
Merge pull request #6341 from paprka/gunspritefix
...
Fixes a few bugs with gun and ammo icons
2014-12-14 23:26:36 -06:00
ecba7e1283
Merge pull request #6300 from Thunder12345/grenade_slugs
...
Adds a new FRAG-12 explosive shotgun shell
2014-12-14 21:07:44 -06:00
ff36952344
Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.
2014-12-15 01:30:18 +01:00
b67043f267
Merge pull request #6329 from phil235/HungerChange
...
Hunger change
2014-12-14 12:55:21 -06:00
dc654e74db
Removes white ian undershirt
...
As requested by the head coders. Too many ian shirts.
2014-12-14 15:21:28 -03:00
27e3640bdd
Fixes monkeys being able to read books
2014-12-14 13:06:33 -05:00
abe866f2d0
Fixes two runtimes
...
Related to issue #6351
Fixes facehuggers checking oreboxes for stat.
Fixes monkeys dropping HUDs runtime.
2014-12-14 14:40:14 -03:00
7ff196a67d
Fixes Slimes attacking slime people.
2014-12-14 16:31:28 +01:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
412896e1a5
Fixes being able to turn asteroid into normal turf
...
Fixes #6350
2014-12-14 11:44:37 -03:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
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
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
30cbff2802
fixes a few bugs with gun and ammo icons/obj/gun.dmi
2014-12-13 17:13:25 -08:00
f87da5939a
Making nutrition level values into defines.
...
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
2014-12-13 17:15:35 +01:00
32038f1afa
revert jumpsuit armor changes
2014-12-13 00:38:31 -08:00
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
29bde9a48a
Satiety now gives a resistance to catching disease (up to 60%)
...
Snack machine compartment can now only be loaded by using a tray.
Fixes tray being unable to pickup omelette.
2014-12-12 21:21:56 +01:00
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
0e94a86e55
Another typo
2014-12-12 15:50:13 +01:00
70dca65c95
Splitting the huge Chemistry-Reagents.dm into smaller files for better readability.
2014-12-12 14:30:44 +01:00
f9dff2f626
Balancing nutrition and fixing some nutrition stuff that I had missed.
2014-12-12 13:59:31 +01:00
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
250bbd7f4d
fixes bug with a sec uniform, buffs engie hardsuits
2014-12-11 17:35:10 -08:00
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
3bc8b4f777
Description update
...
Changed the description of the FRAG-12.
2014-12-11 21:23:16 +00:00
a0476d975e
Movin' house
...
Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
2014-12-11 21:23:15 +00:00
Cheridan
paprka
hornygranny
Razharas
phil235
Remie Richards
Menshin
Steelpoint
Cuboos
Menshin
tkdrg
Xhuis
Thunder12345