cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-05 14:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 16 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

8353 Commits

Author SHA1 Message Date
Mechoid
d3cc476eb0 Un-fub comments. 2018-02-20 13:57:51 -08:00
Mechoid
a2c30eb699 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mining_Optimization 2018-02-20 12:58:38 -08:00
Mechoid
8a3dcc5cc1 Makes Mining Satchels brute-force their way out of lagging, minerborg prodding. 2018-02-20 12:58:13 -08:00
Anewbe
25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
Arokha Sieyes
0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
RadiantFlash7
7baf48b420 Mapchanges, new winter trees 
Mostly Engineering and security re-works. And then re-re-works
 2018-02-20 09:01:10 -05:00
Woodratt
dad162659a New Cave PoIs 
- Addition of 6 new potential PoIs for the cave z-level.
 2018-02-20 00:59:30 -08: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
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
Anewbe
cce3c607f2 HoS/Warden helmet tweaks 2018-02-17 15:57:26 -06:00
Leshana
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
atermonera
4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00
Anewbe
b7658d49ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-17 15:22:28 -06:00
Anewbe
38cb9bc406 More progress 2018-02-17 13:28:44 -06: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
eb423c6739 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-17 10:16:45 -06: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
Anewbe
5c9fd04ed3 Fixes some goofs 2018-02-17 01:19:57 -06:00
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 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
1593e4fdeb Steals more modular armor code 2018-02-16 18:41:07 -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
79b8c283f7 Merge pull request #4845 from Heroman3003/grill-typo 
Fixed typo in unfastening grille
 2018-02-16 12:50:18 -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
Heroman3003
bd6ef1b09f Fixed typo in unfastening grille 
Grille, not grill
 2018-02-16 11:38:12 +10:00
Anewbe
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
BillyBangles
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
Anewbe
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