cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,706 Commits 5 Branches 0 Tags
bb66e03f18d05814230efdc818db997e9035fb0d
Commit Graph

6871 Commits

Author SHA1 Message Date
Anewbe
9f56416684 Merge pull request #5037 from VOREStation/aro-updateicons 
Rewrite human/update_icons()
 2018-03-11 21:03:10 -05:00
Cerebulon
b7090d7df2 Adds Tajaran Akhani language. (#5032) 
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
 2018-03-11 16:55:08 -05:00
Mechoid
edab848f2f Merge pull request #5024 from Anewbe/random_spawners 
Splits up random.dm
 2018-03-10 19:07:47 -08:00
Anewbe
f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN 
Adds the ED-CLN
 2018-03-10 15:04:07 -06:00
Layne
acdde85f4d Reinforced snowball fix. (#4991) 
* temp snowball fix

* Create MisterLayne - SnowballTEMPFIX

* Update and rename MisterLayne - SnowballTEMPFIX to MisterLayne - SnowballTEMPFIX.yml
 2018-03-10 14:58:25 -06:00
Arokha Sieyes
2970b37fa1 U_I Phase 2.6: Blood, Helmets, Unneeded calls 2018-03-08 19:34:01 -05:00
Arokha Sieyes
306a484b48 U_I Phase 2.4: Storage cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes
53a185f838 U_I Phase 2.0: Code cleanup 
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
 2018-03-08 19:33:44 -05:00
Arokha Sieyes
62e0c122fa U_I Phase 1.4: More preview fixes, not done yet 2018-03-08 19:31:56 -05:00
Arokha Sieyes
3be602dece U_I Phase 1.3: Previews are broken, so that's a thing 2018-03-08 19:31:55 -05:00
Arokha Sieyes
2f433c9ea9 U_I Phase 1.2: Something is broken somewhere 2018-03-08 19:31:54 -05:00
Arokha Sieyes
94c2110f27 U_I Phase 1.1: Fix phase 1 bugs 
Softsuits making your clothes disappear, PDAs in ID slot making you double
 2018-03-08 19:31:54 -05:00
Arokha Sieyes
aa9ec19118 U_I Phase 1.0: First consolidation pass 2018-03-08 19:31:43 -05:00
MisterLayne
21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Anewbe
d172881b76 Splits up random.dm 2018-03-06 19:51:20 -06:00
Atermonera
81e5ea9536 Ater poi3 (#4968) 
* Supply Drop POI

* Ration Cache

* BlastMine1

* Supply Drop 2

* Tweaks, package bomb detonators can be re-used

* Changelog

* Missed some spots while cherry-picking

* Merge branch master (I hope this works)

* Appeases travis

* Missed a spot
 2018-03-05 19:55:27 -06:00
Anewbe
4503e475b1 Merge pull request #5014 from PolarisSS13/Ater_Weather_report 
Weather reports won't crash when planet controller dies
 2018-03-05 19:46:25 -06:00
Mechoid
1c94c32830 Mob Spawners can now override certain vars. (#5005) 
* Random Mob Spawners can now overwrite certain vars on the mobs they spawn.

* Spiders return home.

* Faction Streamline
 2018-03-05 19:45:11 -06:00
Atermonera
6402538f3c Weather reports won't crash when planet controller dies 2018-03-04 15:41:55 -08:00
Atermonera
3a85517d30 Merge pull request #5001 from Nerezza/Snowfloorfix 
Fixes #4993
 2018-03-04 10:02:14 -08:00
Atermonera
7a49fae955 Merge pull request #4997 from Cyantime/patch-1 
Fixes typo in alien pod loot pile
 2018-03-03 17:44:18 -08:00
Nerezza
b9b79af6c2 Fixes #4993 
Snow overlays no longer block interractions with the floor beneath them.
 2018-03-03 11:26:15 -06: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
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
dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama 
Adds 'Intercom Convo' verb
 2018-03-01 10:32:30 -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
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
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
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
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
atermonera
48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -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
Anewbe
5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes 
Flooring fixes
 2018-02-25 12:39:33 -06:00