635013f331
Merge branch 'virgoMaster' into virgoPull
2018-06-10 12:33:29 -07:00
b5eea2cffa
Merge pull request #5320 from VOREStation/pol-hoods
...
Radiation closet hood fix
2018-06-02 16:23:08 -04:00
1222e5d0d6
Merge branch 'master' into hangryrat
2018-05-28 15:08:53 +03:00
b96aec1e52
SYNC: Missed another closet (typo)
2018-05-27 19:53:45 -04:00
1437123502
SYNC: Missed one
2018-05-27 19:43:39 -04:00
8f8c41a7c1
SYNC: Correct vorestation closets/crates to use new system
2018-05-27 19:33:34 -04:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
e1fe4d5a5d
Merge pull request #5293 from VOREStation/pol-closets
...
Makes closets/crates like boxes
2018-05-26 15:24:45 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
9bc6663930
Crates should always appear below their contents
2018-05-24 17:24:14 -05:00
f9b409549e
Makes closets/crates like boxes
...
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
2018-05-24 17:26:17 -04:00
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
7ec5adf010
Remove some missed spare helmets
...
Fixes #3724
2018-05-18 14:42:29 -04:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
c4f9017c76
Rename snake to giant snake
...
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -04:00
4d028ee0f3
Removes my incompetence.
...
Re-adds my incompetence.
2018-05-08 18:41:47 -07:00
3a2f21ca31
Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets.
2018-05-08 16:19:44 -07:00
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
f8d6449bc1
pathing update
2018-04-30 20:30:16 +03:00
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
b06b1d16a8
Makes file pathing for mobs not complete autism
2018-04-28 13:37:41 -04:00
ed1e1aaa5c
renames to bigrat, adds neutral one to pred crate as well
2018-04-16 09:51:59 +03:00
0af8620ee1
Merge branch 'virgoMaster' into virgoPull
2018-04-15 11:06:40 -07:00
2dec2545e5
Adds giant rat voremob.
...
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
2018-04-11 20:44:53 +03:00
b52bb9a7f0
Add custom items for Igni/Kelly Summers
2018-04-05 19:11:40 -07:00
6158cd1d26
POLARIS: Use drop_location() for things
2018-03-13 19:23:46 -04:00
4538a6859f
POLARIS: Use drop_location() for things
2018-03-08 13:03:09 -05:00
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
8c5dc66a13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-21 23:33:17 -06:00
25a1f47a30
Headset sprites, planetside headset functionality ( #4869 )
2018-02-20 12:36:22 -08:00
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
cce3c607f2
HoS/Warden helmet tweaks
2018-02-17 15:57:26 -06:00
ef3df27528
VOREStation Specific Merge Changes
...
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
b7658d49ab
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-17 15:22:28 -06:00
7cc8fa0cba
Gives Miners shinybits. ( #4840 )
...
* Gives miners marker beacons, moves their locker to another file
* Makes marker beacons ITEM_SIZE_SMALL
2018-02-17 11:19:48 -08:00
5c9fd04ed3
Fixes some goofs
2018-02-17 01:19:57 -06:00
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
526e886a21
Merge pull request #2994 from Verkister/badboi
...
Adds a fancy new voremob.
2018-02-10 23:04:47 -06:00
8c36391925
Propernaming for VIRGO PR#3000
...
https://github.com/VOREStation/VOREStation/pull/3000
2018-02-08 17:45:12 -06:00
251297a2ba
Promethean Balancing, Lore-compliant Modification of Security Equipment ( #4722 )
...
* Works on Balancing Prometheans
* Reorganize from Master Merge
* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
13b710fb61
Silver-ContrabandUpdate
...
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
2018-02-08 13:01:51 -06:00
d240032910
some changes
2018-02-08 10:57:45 +02:00
7afc963393
Adds a fancy new voremob.
...
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
2018-02-08 10:11:42 +02:00
ce92a992ca
Merge pull request #4747 from Woodratt/02062018_MapfixesShuttleupgrde
...
Shuttle Upgrades and Map Fixes
2018-02-07 23:33:33 -06:00
7ee2b5266a
Shuttle Upgrades and Map Fixes
...
- Upgrades the shuttles with enviroment sensors and the ability to see if the rear hatch is open.
- Gun cabinets station side in the hangar control rooms. Explorer, Pilot, Armory Access.
- Surgery room redesign, replaced closets with wall closets.
- Multiple other smaller map bug fixes.
2018-02-06 22:58:44 -08:00
5847319443
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
cef001bf2a
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
4f98fad36b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
...
# Conflicts:
# .travis.yml
# code/_away_mission_tests.dm
# code/modules/admin/verbs/mapping.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z10.png
# nano/images/nanomap_z2.png
# nano/images/nanomap_z3.png
# nano/images/nanomap_z5.png
# nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Reddeyfish