Commit Graph

21031 Commits

Author SHA1 Message Date
Datraen
6660b6f61c Tweaks plants to create a more diverse selection, different environment constants. 2015-11-05 18:43:05 -05:00
Woodrat
0929cb4cc2 Woodrat v9.6 "Open Beta"
- Minor tweaks to sleepers so they can can be set in different directions
- Sleepers and body scanners added to all maps
2015-11-03 14:30:56 -08:00
Jon
221a4edc19 Attempts to revert and/or fix some of the changes that went into Bay Dev to alter sleepers/scanners.
- Removes the NORTH/SOUTH sprites for the scanners, consoles, sleepers, etc. They're new, we don't use them, and I don't particularly like the look of them. We can add them back later if necessary.
- As per the new changes I've kept directional sprites as opposed to "thing-r" for right facing.
- The new body scanner sprite (white, whereas the previous is a grubby grey) has been reverted as it does not match the console.
- Sleeper console re-added, new sleeper NanoUI is still in but runs off the console not the sleeper.
- Proper directional stuff kept with the consoles, as far as I'm aware. By default the sleepers/scanners all have the consoles on the right. Light code changes will be needed to accommodate alternatives, the sprites still exist.
- Both consoles are animated and correctly disable animation with no power.
- Scanners are still entered with a verb, or clicking when grabbed, whereas sleepers are entered by click-dragging from the mob. This will probably want to be unified as I don't think this is how it used to be.
- Both consoles can be walked through, as was previously changed on Polaris.
- NO MAPPING CHANGES! The consoles work but will need to be mapped in to maps using the Polaris codebase.
2015-10-31 22:55:17 +00:00
Neerti
865f4b1d38 Revert "Comments out clothing coverage." 2015-10-31 04:15:36 -04:00
Mark9013100
61f9608324 Comments out clothing coverage.
Comments out the slot_is_accessible flag.
2015-10-30 13:45:43 -04:00
Neerti
2f116e3374 Fixes a mistake involving belts not getting icons. 2015-10-29 21:56:36 -04:00
Neerti
1125961c18 Merge branch 'dev2' of https://github.com/PolarisSS13/Polaris into 10/20/2015_finish_ling 2015-10-29 21:45:01 -04:00
Neerti
92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04:00
Mark9013100
9b9bcff9de Brings back the Ausop helmets added in one of my earlier PRs.
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
Woodrat
7128aa72db Woodrat 9.1 "Back in Action"
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
2015-10-16 22:57:13 -07:00
Datraen
39d384cbe4 Makes Deckard's gun usable. 2015-10-14 19:05:14 -04:00
Neerti
7571ba8c4b Think I'm done. 2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705 TG_Port
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
2015-10-11 00:58:26 -04:00
Neerti
24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100
97a95c80a1 Department voidsuits can be ordered from cargo 2015-10-11 00:45:39 -04:00
Mark9013100
64ccad7790 Fixes #77 2015-10-11 00:45:27 -04:00
Mark9013100
a2c8e3ee10 Minor edits to the sec lockers
Conflicts:
	maps/colony-1.dmm
2015-10-11 00:45:22 -04:00
Mark9013100
ce4b21550a Edits the Z8, L6, and A12
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:44:47 -04:00
Mark9013100
0714ce3f93 Update automatic.dm 2015-10-11 00:44:22 -04:00
Mark9013100
fa361890ff Minor change to the auto shotgun and SAW
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/obj/rig_modules.dmi
2015-10-11 00:44:18 -04:00
Mark9013100
488ebc89b2 Balances fm-t2, nerfs burstfire
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:42:26 -04:00
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
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