cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-27 22:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,030 Commits 66 Branches 25 Tags
master
Commit Graph
7622 Commits
Author SHA1 Message Date
Anewbe 9bf3791503 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-17 01:07:21 -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 SieyesandGitHub 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 1593e4fdeb Steals more modular armor code 2018-02-16 18:41:07 -06:00
AnewbeandGitHub ab9f296adb Merge pull request #4837 from Schnayy/giftitems 
Gift items + Cargo crate
 2018-02-16 12:52:59 -06:00
AnewbeandGitHub 004ff0166d Merge pull request #4822 from VOREStation/pol-sa-playerqol 
Player-controlled SA QoL
 2018-02-16 12:52:14 -06:00
AnewbeandGitHub 79b8c283f7 Merge pull request #4845 from Heroman3003/grill-typo 
Fixed typo in unfastening grille
 2018-02-16 12:50:18 -06:00
AnewbeandGitHub 2f4df23c0b Merge pull request #4841 from MisterLayne/space_grilles 
Allows you to grille in space.
 2018-02-16 12:46:07 -06:00
Aronai SieyesandGitHub 15a5e5e10b Merge branch 'master' into pol-sa-playerqol 2018-02-15 21:56:53 -06:00
Heroman3003 bd6ef1b09f Fixed typo in unfastening grille 
Grille, not grill
 2018-02-16 11:38:12 +10:00
AnewbeandGitHub cd0394c88b Merge pull request #4834 from VOREStation/pol-borgbright 
Fixes lack of borg fullbright with mesons etc
 2018-02-15 19:12:33 -06:00
MisterLayne 87d1c85534 I will fite these '<<'s. 2018-02-15 17:16:02 -05:00
BillyBanglesandAnewbe f5dfbff1bd Build igloos and snowmen (#4811) 
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
 2018-02-15 14:25:51 -06:00
AnewbeandAtermonera 7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08: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
AnewbeandGitHub ca7e771aca Merge pull request #4809 from Mechoid/Modkits 
Suit Modkit Compatability
 2018-02-13 10:41:35 -06:00
AnewbeandAtermonera 51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
AnewbeandAtermonera 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
BillyBanglesandAnewbe 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
CyantimeandAnewbe 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
MechoidandAtermonera e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -08:00
AnewbeandAtermonera 6f2c47e5a9 Trees take damage from bullets/lasers (#4786) 2018-02-11 18:57:20 -08:00
AnewbeandGitHub 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
Aronai SieyesandGitHub 7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
Aronai SieyesandGitHub 526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -06:00
AtermoneraandGitHub 2427dceb37 Lets signal names be mapped 2018-02-10 15:51:49 -08:00
AnewbeandGitHub 252b2ffa1c Merge pull request #4772 from Atermonera/obfus_gps 
GPS coordinates and POI names are obfuscated
 2018-02-10 17:51:48 -06:00
AnewbeandGitHub 78042b8db6 Merge pull request #4760 from Neerti/2/8/2018_door_assembly_fix 
Makes Projectiles Sometimes Pass Through Door Assemblies
 2018-02-10 01:55:38 -06:00
AtermoneraandAnewbe 05c62ba9eb Adds EMP mines (#4679) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* Counter-update

* Refactors mine code. Adds emp mines.

* Hecking spaces

* It compiles this time. For real, I swear
 2018-02-10 01:53:54 -06:00
mistyLuminescenceandAtermonera fa6ff94474 What's Yours Is Mined (#4556) 
* Boom!

* Wires!
 2018-02-09 18:56:46 -08:00
atermonera fae9c63ccf GPS coordinates and POI names are obfuscated 2018-02-09 16:59:03 -08:00
MechoidandGitHub 736134d10f Merge pull request #4707 from Cerebulon/virologyRetoothing 
Gives Virology teeth again
 2018-02-09 11:49:45 -08:00
SilverandGitHub 8c36391925 Propernaming for VIRGO PR#3000 
https://github.com/VOREStation/VOREStation/pull/3000
 2018-02-08 17:45:12 -06:00
MechoidandAnewbe 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
AnewbeandGitHub 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
BillyBanglesandAnewbe 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 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
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
Neerti a38e66305b Makes Projectiles Sometimes Pass Through Door Assemblies 
What it says on the tin.
 2018-02-08 04:37:21 -05:00
Verkister d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister 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
AnewbeandGitHub a80f9d345e Merge pull request #4746 from Cyantime/defibruntime 
Fix paddle runtime
 2018-02-07 23:34:44 -06:00
AnewbeandGitHub ce92a992ca Merge pull request #4747 from Woodratt/02062018_MapfixesShuttleupgrde 
Shuttle Upgrades and Map Fixes
 2018-02-07 23:33:33 -06:00