cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,876 Commits 14 Branches 2 Tags
master
Commit Graph
7762 Commits
Author SHA1 Message Date
Ranged 550e2300f9 Fixed flashbang container interaction 2018-12-24 19:49:36 +01:00
variableundefinedandGitHub 65ca04f05d Merge pull request #10450 from datlo/toxinstechdisk 
Add toxins technology research and the Bluespace RPD
 2018-12-24 09:20:52 +08:00
variableundefinedandGitHub 24ebcda6c4 Merge pull request #10474 from datlo/syndicateremap2 
Adds Syndi Officer admin job and remaps SST/SIT starting areas 2
 2018-12-24 09:17:15 +08:00
AffectedArc07andGitHub fbd31bd46a Merge branch 'master' into emitter-reflectors 2018-12-23 23:26:47 +00:00
AffectedArc07 3ba1837c9f Adds reflectors 2018-12-23 23:07:01 +00:00
datlo 6fe32ee6ae Add shrapnel to frag grenades 2018-12-19 07:49:05 +00:00
datlo b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
datlo 47664f404b frag grenades do not breach, have more radius 2018-12-18 04:12:09 +00:00
datlo 987a670b76 remove implied src, change beakers in facid grenades 2018-12-18 02:04:35 +00:00
datlo d0ea5d0e97 fix facid grenade naming 2018-12-17 22:36:31 +00:00
datlo 1e9e6c7c6b fix weird spacing? 2018-12-17 12:15:16 +00:00
datlo 3f2804c8bf adds the grenadier belt and permafrost'd tiles 2018-12-17 11:53:28 +00:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefinedandGitHub c011c0ad2f Merge pull request #10441 from datlo/boxsprites 
Add sprites to specie specific boxes
 2018-12-15 18:15:52 +08:00
variableundefinedandGitHub 0c134f19b8 Merge pull request #10389 from Edefff/Fix-cigarette-chem-consumption 
Fix cigarette chem consumption
 2018-12-13 23:08:54 +08:00
variableundefinedandGitHub 16a064d1e6 Merge pull request #10422 from Kyep/depot_update_4 
Depot Update
 2018-12-13 23:06:29 +08:00
variableundefinedandGitHub 3571c7d157 Merge pull request #10424 from Mitchs98/sushi 
Adds Sushi Mat and Sushi Makiroll
 2018-12-13 23:01:06 +08:00
datlo fde4faed76 Made tanks empty, remove unnecessary tank types and added toxins tech requirement to AEG and welding gas mask 2018-12-12 23:31:43 +00:00
datlo 0c8d8ffaa8 fixes 
readded toxins tech requirement to BRPD design, i thought it was the
item itself derp
fixed a bug where BRPD wouldn't make a beam if you clicked pipes
directly
added a period for consistency
 2018-12-12 22:51:38 +00:00
datlo c1864de126 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into toxinstechdisk 2018-12-12 22:29:18 +00:00
datlo 5ef66ae01d Add bluespace RPD 2018-12-12 18:24:43 +00:00
variableundefinedandGitHub 07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD 
Trying to Diagnose rsc issues
 2018-12-12 13:28:55 +08:00
datlo 5651009eb5 add sprites to specie specific boxes 2018-12-11 14:48:55 +00:00
variableundefinedandGitHub 44414201f4 Merge pull request #10399 from Darkmight9/Nanopaste_Overheal 
Gives Nanopaste overheal
 2018-12-11 21:29:10 +08:00
variableundefinedandGitHub 9e5deff65e Merge pull request #10409 from AzuleUtama/uplinkSearch 
Uplink - Collapsible Categories and Layout Tweaks
 2018-12-11 20:45:45 +08:00
variableundefinedandGitHub 7d33a49a30 Merge pull request #10433 from Kyep/singulo_warning 
Clarifies BoH/BoH warning
 2018-12-11 20:38:59 +08:00
variableundefinedandGitHub 10da4f2436 Merge pull request #10431 from Tails2091/random_items 
random_items Cleanup
 2018-12-11 20:29:55 +08:00
variableundefinedandGitHub 9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak 
You can stick duct tape to more than just paper now
 2018-12-11 20:18:05 +08:00
variableundefinedandGitHub a5d44ef87e Merge pull request #10322 from Birdtalon/speciesboxes 
Speciesboxes; species specific starting boxes
 2018-12-11 19:57:30 +08:00
Aurorablade 87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
Kyep 4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
Kyep e204fd6638 Clarifies BoH/BoH warning 2018-12-08 19:44:28 -08:00
Kyep 7c1f40ea14 WIP omnizine/SR/virus bottles, minerals 2018-12-08 19:33:21 -08:00
Tails2091 cf3025d7a8 random_items Cleanup 2018-12-08 18:33:46 -05:00
Mitchell 242ef496cf Removed extra comma. 2018-12-07 16:24:54 -06:00
Mitchell 54c4325c46 Adds Sushi Mat and Sushi Makiroll 
Makes sushi 100% more efficient and viable to make a restaurant out of.
 2018-12-07 13:28:10 -06:00
datlo 34db3b373e add teleporter, various misc changes 2018-12-07 16:29:48 +00:00
datlo 19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
Kyep 80da2626c7 tweak: changes trapped pizza box auto-arm from 1s to 3s timer 2018-12-06 19:25:31 -08:00
Kyep 0d91b3b619 deletes trapped syndi toolbox 2018-12-06 19:13:56 -08:00
AzuleUtama 00c34f1935 Blocks job specific gear category for nukies, removed last of 'return' function uplink code, minor layout changes to template 2018-12-07 00:09:11 +00:00
AzuleUtama d9215f3789 Made temp category start as null, cleaned up template code 2018-12-06 10:19:23 +00:00
Shadow-QuillandGitHub 0a70c3549c Changed 'protocals' to 'protocols' 
SPELLING WHEE
 2018-12-05 10:59:52 -06:00
AzuleUtama a578f9cef7 Uplink Category Search 
Makes it so users can pick categories in the uplink
 2018-12-05 16:02:51 +00:00
Darkmight9 000ce96c1c updates my work folder 2018-12-04 12:20:16 -05:00
Darkmight9 dd5c18a8b4 Gives nanopaste overheal 2018-12-03 01:03:47 -05:00
Granodd 9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
EdefffandGitHub fdf6f521d6 Fix cigarette chem consumption 
https://github.com/ParadiseSS13/Paradise/pull/10122 attempted to fix rollies by transferring .4u of each chem present in them instead of .4u shared between all chems. Prior to this, if a chem took up less than 25% of the chem volume, the user would not metabolize any as they would receive less than .1u of the chem, and amounts less than .1 are ignored.

However, that change caused all cigarettes to burn through their chems at a much faster rate than normal if they had more than one chem inside them. A full cigarette with 2 chems inside it would run out twice as fast, and 3 chems three times as fast, and so on. This means Syndicate cigarettes, for example, now last half as long.

This commit fixes the original problem whilst still maintaining the original chem rate. It still transfers .4u split between all chems, however if a chem doesn't take up enough of the total volume to transfer at least .1u, it will bump the amount to .1, ensuring each chem will be metabolized.

This also fixes the rollie smoketime to be in line with the new chem volume. The new value is 100 / .4u = 250. The old value, even without the above changes, meant that the rollie would burn out before delivering all of it's volume if it only had one chem in it.
 2018-11-30 20:57:34 -08:00
Citinited 6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
variableundefinedandGitHub 00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1 
Chaplain tweaks
 2018-11-29 14:22:03 +08:00