cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,686 Commits 9 Branches 0 Tags
edab848f2f32dc9814deb96397df80c04a7d7a7c
Commit Graph

27560 Commits

Author SHA1 Message Date
Screemonster
13e83b00d1 Makes drills report faults over supply channel (#4989) 
* Makes drills report faults over supply channel

* too chatte

* caps and punctuation are important
 2018-03-03 18:47:07 -06:00
Nerezza
b9b79af6c2 Fixes #4993 
Snow overlays no longer block interractions with the floor beneath them.
 2018-03-03 11:26:15 -06:00
Belsima
3c6e7a95b9 orgam 2018-03-03 11:43:50 -05:00
Heroman3003
9d001c25aa Fixed supply manifests having wrong amount of packages in shipment (#4994) 2018-03-02 18:25:28 -08:00
BillyBangles
6ff1f1b165 fixes #4992 (#4995) 
i'm good at this i swear
 2018-03-02 18:24:51 -08:00
Belsima
c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
Cyantime
4bc4ccc91c Alien pod typo 2018-03-03 00:11:30 +00:00
Verkister
d077784729 Fixes drone borgs spawning with dropped IDs 
Someone had moved the thing back to the outcommented older code part without updating the old code there.
 2018-03-02 11:20:14 +02:00
Anewbe
0722293830 Manual revert of https://github.com/PolarisSS13/Polaris/pull/4839 (#4908) 2018-03-01 21:27:04 -08:00
Mechoid
09dd73ae64 Merge pull request #4986 from Anewbe/hail_adjustments 
Hail is less omnicidal
 2018-03-01 13:39:49 -08:00
Belsima
84d66c51df DNA injectors cause cloneloss. (#4958) 2018-03-01 12:49:11 -08:00
Anewbe
524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
Anewbe
c13c1c6ad0 Adjusts PoIs (#4954) 
* Adjusts PoIs
 2018-03-01 11:57:18 -08:00
Anewbe
ee9061e80f Merge pull request #4982 from Cyantime/tinypda 
Fixes two minor PDA cart issues.
 2018-03-01 11:09:26 -06:00
Anewbe
4efc7e7efe Merge pull request #4979 from Belsima/cube 
Discourages eating monkey cubes
 2018-03-01 10:32:57 -06:00
Anewbe
dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama 
Adds 'Intercom Convo' verb
 2018-03-01 10:32:30 -06:00
Belsima
085f88cdc9 GORILLA - The Revival (#4957) 
* GORILLA

* is this absolute

* less indentation

* Minor balance adjustments

* Mech update
 2018-02-28 22:33:56 -06:00
Anewbe
3c4996b475 Hail is less omnicidal 2018-02-28 14:45:10 -06:00
Anewbe
36540182df Merge pull request #4965 from Belsima/techy 
Adds illegal and other tech to some implants.
 2018-02-28 14:17:17 -06:00
BillyBangles
2ab9bfe79b Turns the station into 420-station 13. (#4971) 
* adds rolling paper and joints

F O U R T W E N T Y   B L A Z E   I T

* adds joint sprites

(they're pretty bad though)

* adds rolling paper box, adds papers to cig vendors

* c h a n g e l o g

smoke
weed
every
day
 2018-02-28 14:16:42 -06:00
Anewbe
2bcad10584 Merge pull request #4974 from VOREStation/pol-plushsshhhshsh 
Ports Plenty Pretty Paradise Plushes
 2018-02-28 11:19:55 -06:00
Mechoid
5dc7189cf7 Various Loot Pile and Dungeon objects Stage Uno (#4975) 
* Loot Piles

* Mecha Loot Piles, Random Tool Spawners

* Fix Random Spawners, don't use Fiftyspawners
Fix Fiftyspawners
 2018-02-28 11:18:44 -06:00
Anewbe
65d3a6f199 Merge pull request #4976 from Woodratt/02262018_thenorth 
Wilderness Overhaul
 2018-02-28 11:18:10 -06:00
Atermonera
dfe41e3250 Made a <br> into a <brr> 2018-02-27 21:42:41 -08:00
Cyantime
ec5f2543d7 Fixes two minor PDA cart issues. 2018-02-27 22:45:09 -05:00
Arokha Sieyes
7aa5ca479a Adds 'Intercom Convo' verb 
Allows an admin to 'schedule' up to 20 messages to play on the radio.
 2018-02-27 21:17:47 -05:00
Anewbe
33766df3d4 Fixes a runtime in hail code (#4973) 2018-02-27 17:46:08 -08:00
BillyBangles
f49b1a9ad2 Adds ice puzzle POIs (#4963) 
* adds slippery ice tiles

* adds ice puzzle POIs

also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
 2018-02-27 17:45:47 -08:00
Atermonera
d345a60ad7 Merge pull request #4960 from Nerezza/Shutter-tape 
Makes tape appliable to hazard shutters just like airlocks
 2018-02-27 17:45:11 -08:00
Belsima
d8b0685d25 Discourages eating monkey cubes 2018-02-27 18:19:05 -05:00
Arokha Sieyes
1afa7a10f5 Further toy tweaks 2018-02-27 16:00:32 -05:00
Arokha Sieyes
6d165a5059 Belsima toy word changes 2018-02-27 16:00:32 -05:00
Arokha Sieyes
63fd767102 Rebased deconflicted plush additions 2018-02-27 16:00:16 -05:00
Belsima
a578eeeb85 plushie love (#4964) 
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
 2018-02-27 14:49:06 -06:00
Anewbe
cf79159b31 Merge pull request #4967 from Atermonera/umbreload 
Adds umbrellas to loadout, for 3 points
 2018-02-27 14:48:04 -06:00
Schnayy
36236e1883 Sivian Western Sprite Pack (#4970) 
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
 2018-02-27 14:24:20 -06:00
Woodratt
dd7bfd6c43 Wilderness Overhaul 
- Heavy rework of the wilderness, minor adjustments to mining and outpost z-levels. To get to the wilderness you now have to travel through the mine z-level to do so, follow the green flagged path through the mine.
  - Shuttles can now land at a site near the entrance to the wilderness. Removal of the mine shuttle landing pad to move it to the wilderness.
  - New addition of warning sign, thanks to Schnayy.
  - Bugfixes for Heist shuttle not going back to raider post, light overlays on shuttle areas, and certain shuttles not leaving behind floor tiles when they should.
 2018-02-26 20:10:46 -08:00
elgeonmb
8c9c99f817 Adds new languages (#4961) 
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
 2018-02-26 21:21:50 -06:00
Anewbe
4422b2f56d Merge pull request #4956 from VOREStation/vplk-pies-fileorg 
Reorganizes atmos pipes into separate files by type.
 2018-02-26 21:10:39 -06:00
atermonera
48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater 
Makes drinking bleach bad for you
 2018-02-26 12:16:13 -08:00
Atermonera
eaaec93df2 Merge pull request #4955 from Anewbe/prommie_water_fix 
Fixes a bug in Promethean water ingestion
 2018-02-26 12:15:51 -08:00
Atermonera
56b54aba73 Merge pull request #4948 from Nerezza/Tilematic 
Adds TG-style floor tile swapping
 2018-02-26 12:12:26 -08:00
Anewbe
d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox 
Trinket box
 2018-02-26 10:04:14 -06:00
Belsima
59e07f941e Implant Tech 2018-02-26 09:23:18 -05:00
Nerezza
413e832825 Makes tape appliable to hazard shutters just like airlocks 
Clicking hazard shutters with tape will tape them up like airlocks, instead of opening them (if you have the access to).
 2018-02-25 14:46:32 -06:00
Neerti
355aaec3d2 Merge pull request #4950 from Anewbe/yet_another_fix 
Should be able to attach accessories by clicking the target item again
 2018-02-25 14:11:43 -05:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Anewbe
5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes 
Flooring fixes
 2018-02-25 12:39:33 -06:00
Anewbe
a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00