Commit Graph

6793 Commits

Author SHA1 Message Date
Anewbe 14196a9404 Tones down package bombs 2018-02-19 15:45:21 -06:00
Arokha Sieyes 3841dde58c Explorer box gets goggles 2018-02-19 16:16:52 -05:00
Anewbe 9c1645257b Merge pull request #4875 from VOREStation/pol-boxes
Moves most boxes to use starts_with
2018-02-19 13:57:23 -06:00
Leshana 805b7f7b78 Make gas turbine constructable and operational
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
2018-02-18 21:21:50 -05:00
Leshana 31b8e30aac Adds Timeclock Terminals: A machine for viewing your PTO balance.
* Timeclock machine and NanoUI template.
* Circuit board for construction.
* Frame datum for construction on walls.
* Sprites by VerySoft
2018-02-18 20:42:22 -05:00
Arokha Sieyes 9f74137a87 VS: Specific changes for boxes and pumps 2018-02-18 19:38:01 -05:00
Anewbe 3e51ed06cf Cryobag oxygen supply increased (#4866) 2018-02-18 11:48:30 -08:00
Arokha Sieyes 3178b95b6c POLARIS: Moves most boxes to use starts_with 2018-02-18 13:29:21 -06:00
Arokha Sieyes cabe2676e9 POLARIS: Moves most boxes to use starts_with 2018-02-18 13:03:05 -06:00
Anewbe e588d6ad98 Ghetto splints now spawn properly when used in hand (#4857) 2018-02-18 01:09:34 -08:00
Arokha Sieyes 5ec475d563 Travis bull 2018-02-18 00:37:00 -06:00
Arokha Sieyes 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
Aronai Sieyes b1b2551b9c Merge pull request #3058 from VOREStation/aro-joinspeed
Half character-join lag
2018-02-17 23:41:05 -06:00
Arokha Sieyes 0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
atermonera 4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00
Anewbe 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
Anewbe 077b73a446 Suit coolers don't magically shut off in mild fires (#4820) 2018-02-17 11:19:21 -08:00
Anewbe 16295de3cf Merge pull request #4829 from VOREStation/pol-ghostbox
Lets animals and ghosts look in boxes/backpacks/whatever
2018-02-17 10:06:06 -06:00
Anewbe 329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06:00
Leshana 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
Aronai Sieyes 81f946c724 Merge branch 'master' into pol-ghostbox 2018-02-16 22:22:35 -06:00
Arokha Sieyes f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Anewbe 004ff0166d Merge pull request #4822 from VOREStation/pol-sa-playerqol
Player-controlled SA QoL
2018-02-16 12:52:14 -06:00
Anewbe 2f4df23c0b Merge pull request #4841 from MisterLayne/space_grilles
Allows you to grille in space.
2018-02-16 12:46:07 -06:00
Aronai Sieyes 15a5e5e10b Merge branch 'master' into pol-sa-playerqol 2018-02-15 21:56:53 -06:00
MisterLayne 87d1c85534 I will fite these '<<'s. 2018-02-15 17:16:02 -05:00
Schnayy 02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
Arokha Sieyes edd24126aa Fixes lack of borg fullbright with mesons etc 2018-02-15 03:10:04 -06:00
Arokha Sieyes 894b1b32c2 POLARIS: Lets animals and ghosts look in boxes 2018-02-15 02:04:11 -06:00
Arokha Sieyes e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Arokha Sieyes c470f35520 POLARIS: Ghosts can snoop on containers 2018-02-15 01:15:25 -06:00
Arokha Sieyes 5c08ee7a2a POLARIS: Simple Animal Player QOL
Adds a HUD when controlling a simple animal. Allows intents, mostly harm and help if they don't have hands. Disarm and grab if they do. Gives them a generic hud, and adds a var to decide if they have hands or not. Adds a var printed to any client that joins into a mob to explain how to play them, or lore stuff, or whatever you feel like.
2018-02-15 01:15:22 -06:00
Anewbe ca7e771aca Merge pull request #4809 from Mechoid/Modkits
Suit Modkit Compatability
2018-02-13 10:41:35 -06:00
Anewbe 51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804)
* VARIOUS FISTICUFFS RELATED CODE CHANGES
2018-02-12 23:17:35 -08:00
Anewbe 534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
BillyBangles ef86caf177 Adds decorative bones and bone loot pile (#4800)
* adds various bones and bone loot pile

credit to schnayy for most of these sprites

* removes the crossbow bolt from the loot list
2018-02-12 22:13:47 -06:00
Cyantime a2f3443828 SMES tweaks (#4793)
* SMES tweaks

* Replace some fireloss with electrocute_act
2018-02-12 20:39:58 -06:00
Mechoid 96da0430bc Prod suit modkits 2018-02-12 13:10:26 -08:00
Mechoid e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -08:00
Anewbe 922506f56a Merge pull request #4790 from Atermonera/obfus_gps
Lets poi gps units display gps_tag instead of hardcoded string
2018-02-11 01:54:18 -06:00
Atermonera 2427dceb37 Lets signal names be mapped 2018-02-10 15:51:49 -08:00
Anewbe 252b2ffa1c Merge pull request #4772 from Atermonera/obfus_gps
GPS coordinates and POI names are obfuscated
2018-02-10 17:51:48 -06:00
atermonera fae9c63ccf GPS coordinates and POI names are obfuscated 2018-02-09 16:59:03 -08:00
Anewbe 1642848db7 Merge pull request #4754 from VOREStation/vplk-id-refactor
Fix IDs so they do not instantiate every job datum on New
2018-02-08 14:32:42 -06:00
BillyBangles 64b98e0dae Adds 2 new cave POIs (#4743)
* adds temple and ritual POIs

as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't

* fixes all cases of 'candelabra' spelling

i am a dunce

* fixes main map changes

i don't even know what i fuckin did to this thing??? ?? ??? ???

* removes unnecessary light() proc
2018-02-08 14:10:02 -06:00
Silver ef4d87a352 AwooCosplayCrate
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
2018-02-08 12:57:18 -06:00
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Leshana f741bba7cb Fix IDs so they do not instantiate every job datum on New
Every ID was instantiatating and deleting a copy of *every* job datum in its New().  Thats silly.  Switch to initialize so job_master is available.
2018-02-07 16:38:37 -05:00
Cyantime 5816d717f7 Fix paddle runtime 2018-02-06 23:57:44 -05:00