Mark9013100
1273a51f83
Merges f-card box and evidence bag box
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2015-10-11 00:41:46 -04:00
Datraen
d0bd6b8857
[BUG FIX] Wardrobe
...
Socks are now able to be changed from the wardrobe
2015-10-11 00:40:54 -04:00
Mark9013100
fb1134a24b
Changes several helmets, fixes shields
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/modules/clothing/head/helmet.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
SinTwo
4129b95f4e
TG_PORT_fix 2
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/suits/miscellaneous.dm
2015-10-11 00:36:50 -04:00
SinTwo
a2b24d64b7
TG_Port_2
...
Conflicts:
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
code/modules/client/preferences_gear.dm
code/modules/clothing/under/accessories/accessory.dm
2015-10-11 00:36:13 -04:00
Mark9013100
1eab12fc26
Two minor edits to ERT equipment
2015-10-11 00:30:10 -04:00
Mark9013100
3cc7a77846
The detective colt can now be reskinned
...
Conflicts:
code/modules/projectiles/guns/projectile/pistol.dm
2015-10-11 00:30:06 -04:00
Mark9013100
2d709e7862
Flares now spawn in sec lockers
2015-10-11 00:28:47 -04:00
Jon
9f2ec9c163
Adds three new hair flower pins - yellow, blue, and pink.
...
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
Neerti
6740dea5ad
Update Space Station 13 areas.dm
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-10-11 00:26:23 -04:00
Neerti
bbe8c336b2
Adds socks.
...
Conflicts:
code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
4ca487e291
Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom
...
Makes newly fabricated power cells start uncharged
2015-10-09 12:42:22 +02:00
GinjaNinja32
ace1874f37
Merge pull request #11241 from Hubblenaut/light_replacer
...
Amendments to light replacer
2015-10-09 11:35:13 +01:00
HarpyEagle
38775120d7
Updates mechfab
...
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
2015-10-08 16:03:32 -04:00
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
PsiOmegaDelta
aaba2c5c8c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Hubblenaut
a7cad04264
Amendments to light replacer and janitor supply crate
2015-10-06 19:59:56 +02:00
Chinsky
f47a58e23e
Merge pull request #11244 from Kelenius/hackMe
...
Basic encryption hack popup only shows suitable APCs
2015-10-06 20:29:51 +03:00
Chinsky
c7070dd7f7
Merge pull request #11251 from PsiOmegaDelta/151006-JobReport
...
Antagonist summary printout now prefers assignment over special role.
2015-10-06 19:26:42 +03:00
PsiOmegaDelta
ec097d928a
Antagonist summary printout now prefers assignment over special role.
...
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817 .
2015-10-06 09:19:40 +02:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
Zuhayr
e8196675e0
Merge pull request #11228 from Vivalas/dev
...
Adds in AcmeCo brand explosive cigarettes.
2015-10-06 00:42:43 +10:30
Kelenius
f3effa8df7
Basic encryption hack popup only shows suitable APCs
2015-10-05 11:40:19 +03:00
PsiOmegaDelta
91faf8555f
Antag placement now favors mobless turfs.
...
If one such turf is available, otherwise picks a random populated turf. Fixes #11237 .
2015-10-05 10:13:05 +02:00
Vivalas
0bf5145e24
Name change
2015-10-01 13:35:26 -05:00
Vivalas
d2c355a937
Adds in KillerKickthroats
2015-09-30 17:56:35 -05:00
Vivalas
8b6650d217
Briefcase Fix
2015-09-30 17:10:57 -05:00
Daranz
b881d4055f
Make cloners go 'DING!' when ejecting clones
2015-09-27 13:55:37 -04:00
Zuhayr
d1d28b3da5
Merge pull request #11201 from PsiOmegaDelta/150927-TurfInit
...
Turf initialization tweaking.
2015-09-27 22:19:08 +09:30
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
PsiOmega
fa6319d52d
Turf initialization tweaking.
...
Removes the need for a spawn() in New().
2015-09-27 13:18:18 +02:00
Zuhayr
d1e2257218
Merge pull request #11189 from PsiOmegaDelta/150925-BrokenFloor
...
Map tweaks.
2015-09-27 15:05:56 +09:30
mwerezak
03cb79a85d
Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
...
Destroy tweaks.
2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f
Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
...
Makes more sources of radiation respect rad-protection.
2015-09-26 20:10:47 -05:00
Joseph Heinemeyer
9e9df0a15d
Delete ladders.dm
2015-09-26 17:43:52 -07:00
SkyMarshal
c06c3cd245
Adds airless steel floor and blue carpet edge mapping prefabs.
2015-09-26 16:27:47 -07:00
Hubblenaut
f0481b551e
Fixes grab-buckling overwriting pixelshift
2015-09-26 14:11:01 +02:00
PsiOmega
a3b9ab1236
Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.
2015-09-26 09:19:58 +02:00
PsiOmega
709840f848
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/DB ban/functions.dm
2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
GinjaNinja32
c987fedc24
Merge pull request #11180 from BlueNexus/patch-1
...
Gave Asset Protection their proper rig
2015-09-25 14:09:28 +01:00
PsiOmegaDelta
11a03abbf7
Makes more external sources of radiation respect rad-protection.
...
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
2015-09-25 15:02:20 +02:00
PsiOmegaDelta
613b2486ca
Map tweaks.
...
Fixes issues with colored floor tiles having their item state reset, appearing black IG.
Pipe fixes and state cleanup. Floor plating under doors cleanup.
2015-09-25 14:05:39 +02:00
Chinsky
dbbf6bb11e
Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow
...
Glowy items.
2015-09-25 15:03:39 +03:00
Chinsky
0ce1495a12
Merge pull request #11178 from GinjaNinja32/lawzero
...
fix traitor AIs not getting a law zero
2015-09-25 11:46:40 +03:00
Chinsky
407f5bbac3
Merge pull request #11182 from Hubblenaut/dev
...
Lowers the belt layer to below suit
2015-09-25 11:45:57 +03:00
PsiOmegaDelta
9dd1a54191
Destroy tweaks.
...
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091 .
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
