cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
4684 Commits
Author SHA1 Message Date
MisterLayne 21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
LeshanaandGitHub 3a94638dbf Merge pull request #3156 from Verkister/wideborgs 
Small wide/dog borg tweaks/fixes
 2018-03-06 09:43:32 -05:00
AtermoneraandAnewbe 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
Aronai SieyesandGitHub 10a9793fdb Merge pull request #3177 from aztectornado/syringe-case 
Adds quickdraw objects and syringe cases
 2018-03-05 18:36:27 -05:00
Aronai SieyesandGitHub efd96ea7c2 Merge pull request #3178 from VOREStation/aro-sync 
Polaris Sync
 2018-03-05 18:26:24 -05:00
Aztectornado 2d0872b524 Adds quickdraw objects and syringe cases 2018-03-04 18:58:34 -06:00
AtermoneraandGitHub 6402538f3c Weather reports won't crash when planet controller dies 2018-03-04 15:41:55 -08:00
Aronai SieyesandGitHub 96d085cb42 Merge pull request #3154 from Heroman3003/language-upgr-fix 
Fixed Language upgrade not being removed after being applied
 2018-03-04 12:40:52 -05:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
BillyBanglesandAtermonera 6ff1f1b165 fixes #4992 (#4995) 
i'm good at this i swear
 2018-03-02 18:24:51 -08:00
BelsimaandAtermonera c2be6a7575 More standardized grammar (#4977) 2018-03-02 18:24:15 -08:00
BelsimaandAtermonera 84d66c51df DNA injectors cause cloneloss. (#4958) 2018-03-01 12:49:11 -08:00
AnewbeandAtermonera 524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
AnewbeandGitHub ee9061e80f Merge pull request #4982 from Cyantime/tinypda 
Fixes two minor PDA cart issues.
 2018-03-01 11:09:26 -06:00
AnewbeandGitHub dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama 
Adds 'Intercom Convo' verb
 2018-03-01 10:32:30 -06:00
VerkisterandGitHub 0f291cf319 Merge branch 'master' into wideborgs 2018-03-01 08:20:31 +02:00
Arokha Sieyes 3004093a50 Make syringe reuse a bad idea 
Because now it can infect limbs and transfer viruses
 2018-02-28 20:03:18 -05:00
AnewbeandGitHub 36540182df Merge pull request #4965 from Belsima/techy 
Adds illegal and other tech to some implants.
 2018-02-28 14:17:17 -06:00
BillyBanglesandAnewbe 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
AnewbeandGitHub 2bcad10584 Merge pull request #4974 from VOREStation/pol-plushsshhhshsh 
Ports Plenty Pretty Paradise Plushes
 2018-02-28 11:19:55 -06:00
MechoidandAnewbe 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
Verkister 9eeb4f0f65 Small wide/dog borg tweaks/fixes 
-Adds a new var to specify nonstandard borg sprite sizes. No longer dogborg exclusive.
-Makes the dogborg var usable for standard sizes as well (for the special features like rest poses and gun/gut overlays)
-Makes the borg reset module reset the forementioned vars.
-Excludes wideborg from the standard size polaris/vore vr_sprite_check to avoid unintended default file reverts.
 2018-02-28 10:42:40 +02:00
Heroman3003 859483c6cf maybe fix? 2018-02-28 17:40:13 +10:00
Heroman3003 67105d921c Fixed Language upgrade not being removed after being applied 2018-02-28 16:46:53 +10:00
AtermoneraandGitHub 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
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Aronai SieyesandGitHub dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo 
Adds 'Intercom Convo' verb
 2018-02-27 21:48:39 -05:00
Arokha SieyesandLeshana 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
Arokha Sieyes 43065846a4 Adds 'Intercom Convo' verb 
Allows an admin to 'schedule' up to 20 messages to play on the radio.
 2018-02-27 21:24:22 -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
AtermoneraandGitHub 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
BelsimaandAnewbe 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
AnewbeandGitHub cf79159b31 Merge pull request #4967 from Atermonera/umbreload 
Adds umbrellas to loadout, for 3 points
 2018-02-27 14:48:04 -06:00
SchnayyandAnewbe 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
Arokha Sieyes f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00
elgeonmbandAnewbe 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
AnewbeandGitHub d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox 
Trinket box
 2018-02-26 10:04:14 -06:00
BelsimaandGitHub 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
AnewbeandGitHub 5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes 
Flooring fixes
 2018-02-25 12:39:33 -06:00
AnewbeandGitHub a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00
Schnayy 460202cb6e Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict. 
https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png

Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.
 2018-02-25 01:57:03 -06:00
AtermoneraandGitHub 8315c0b92f Merge pull request #4938 from Anewbe/bombs_again 
Further Package Bomb adjustments
 2018-02-24 22:55:40 -08:00
Nerezza c7fdd099b6 Flooring fixes 
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.

Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
 2018-02-24 15:31:10 -06:00
Aronai SieyesandGitHub f29484f8da Merge pull request #3117 from VOREStation/aro-fbpcells 
Adds a synth backup cell to synth survival box, plus goggles
 2018-02-24 14:43:48 -05:00