Mark9013100
080e526e9e
Fixes an issue with helmet visors
2015-10-11 00:40:11 -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
SinTwo
8eac3f8b9b
TG Port
2015-10-11 00:33:44 -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
Datraen
6556e57064
[MISC] Increase number of points for gear loadout
...
Explanitory
2015-10-11 00:28:12 -04:00
Datraen
7856ca948d
[BOTANY] Seed Fixes
...
Fixes seed storage, adds gas scanning properties to scanner
2015-10-11 00:27:49 -04:00
Jon
de2ee16588
Fixes issues with incorrect loadout ids
2015-10-11 00:26:57 -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
2cc8dbbe18
Fixes savefile issue.
2015-10-11 00:24:48 -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
1f1857cc0a
Merge pull request #11257 from Karolis2011/map_capture
...
Added more help/error messages to the capture tool.
2015-10-09 11:35:54 +01: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
mwerezak
83df0fa8f8
Makes powercells produced by the protolathe start uncharged.
2015-10-08 15:10:51 -04:00
Karolis2011
fad0e0b28a
Added more help/error messages to the tool.
2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
Kelenius
82928d3b74
Fixes a minor blob issue, adds mecha attack message
2015-10-07 10:49:24 +03: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
8107786cbd
Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech
...
Makes silicon language handling more robust.
2015-10-06 19:32:54 +03:00
Chinsky
5a83cdaa75
Merge pull request #11252 from PsiOmegaDelta/151006-HUDPositioning
...
Relative HUD element positioning.
2015-10-06 19:32:04 +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
019c147bdc
HUD element positioning.
...
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).
Port of https://github.com/d3athrow/vgstation13/pull/5984 .
2015-10-06 12:51:03 +02: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
HarpyEagle
74950268d7
Fixes fire_stacks update logic
2015-10-05 19:24:33 -04: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
PsiOmegaDelta
bbcadcc080
Makes silicon language handling more robust.
...
Also fixes an issue with lists being targets for qdel(). Fixes #11221 .
2015-10-05 11:21:09 +02:00
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
PsiOmegaDelta
f249bf3bcc
Compilation fixes.
2015-10-04 17:48:41 +02:00
PsiOmegaDelta
96a90bb5e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9
Merge pull request #11238 from Baystation12/master
...
Dev-freeze
2015-10-04 17:31:44 +02:00
GinjaNinja32
5ef5f40cbe
add 'info' topic command to get information on a character
2015-10-02 12:45:19 +01: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
mwerezak
4dc7ff8e9c
Merge pull request #11223 from GinjaNinja32/11222
...
fix #11222
2015-09-30 13:43:47 -04:00
GinjaNinja32
11141462a0
fix #11222
...
also fixes the name and adds feedback to adding items
2015-09-30 00:00:36 +01:00
PsiOmegaDelta
357c716a2b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-29 11:52:48 +02:00
PsiOmegaDelta
86223d65bf
TODO done.
2015-09-29 11:28:31 +02:00
