cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 9 Branches 0 Tags
30454ccdc3780e8b2c0ae09c8eaeb327de2ee659
Commit Graph

2816 Commits

Author SHA1 Message Date
Leshana
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
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine 
Make gas turbine constructable and operational
 2018-02-23 13:16:56 -06:00
Leshana
a1bfd1fb46 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-22 15:43:38 -05:00
Aronai Sieyes
0d4452e78f Merge pull request #3098 from VOREStation/vplk-candles 
Stop candles from messaging the universe when they light.
 2018-02-22 12:27:58 -05:00
Aronai Sieyes
94cdc508bc Merge pull request #3068 from VOREStation/vplk-timeclock-i 
Adds Timeclock Terminals: A machine for viewing your PTO balance.
 2018-02-22 12:27:09 -05:00
Leshana
effd302072 Stop candles from messaging the universe when they light. 2018-02-22 10:17:49 -05:00
Anewbe
51420a0aa7 Flashbangs no longer Stun() 2018-02-22 02:20:25 -06:00
Anewbe
01ae959020 Merge pull request #4865 from Atermonera/umbrella 
Adds umbrellas
 2018-02-21 23:06:44 -06:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization 
Mining Bag / Box Speedification
 2018-02-21 16:15:16 -06:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix 
Fix health analyzer names
 2018-02-21 10:03:09 -06:00
Anewbe
a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels 
Fix several Destoy()s
 2018-02-21 10:01:23 -06:00
Arokha Sieyes
3fdafb7194 Rename medical scanners and update map 2018-02-20 19:25:31 -05:00
Mechoid
d3cc476eb0 Un-fub comments. 2018-02-20 13:57:51 -08:00
Mechoid
8a3dcc5cc1 Makes Mining Satchels brute-force their way out of lagging, minerborg prodding. 2018-02-20 12:58:13 -08:00
Arokha Sieyes
0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
Arokha Sieyes
a75cfe0eb1 POLARIS: Fix several Destroy()s 2018-02-20 00:20:46 -05:00
Aronai Sieyes
7cae95d35c Merge pull request #3080 from VOREStation/aro-exbox 
Explorer box gets goggles
 2018-02-19 17:23:10 -05:00
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
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
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
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
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
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
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
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
e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -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