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

27580 Commits

Author SHA1 Message Date
Serithi
bb66e03f18 I heckin' did a music. As far as i can tell i implemented it properly, testing it out has been finicky as all hell. I figure if i did a goof, the Reddit method of giving the wrong answer first so someone replies with the correct one will work. 2018-03-12 02:46:32 -07:00
Anewbe
2e248b9160 Merge pull request #5046 from Woodratt/03102018_gunsnholoroses 
Munitions/Security Supplypack touchy
 2018-03-12 00:05:40 -05:00
Anewbe
9f56416684 Merge pull request #5037 from VOREStation/aro-updateicons 
Rewrite human/update_icons()
 2018-03-11 21:03:10 -05:00
Arokha Sieyes
830a5f66f0 Fix two minor update_icons() oversights 2018-03-11 20:16:49 -04:00
Woodratt
98c081722e Munitions/Security Supplypack touchy 
- Added, weapons crate for explorers that has bolt action rifles, weapon powercell crate (security access only).
- Touchy of all the munition and security supply pack names so it's easier to tell what crate contains weapons, armor, and or gear.
- Slight adjustment of certain security and weapon crates. Moving some guns out of some crates, splitting some crates up (automatic weapons crate is two crates now) and changing the type of crate stuff comes in.
- Holoplant fix, now properly comes in a crate instead of being shipped without a protective box.
 2018-03-11 15:26:32 -07: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
Mechoid
06eb3e5e47 Merge pull request #5018 from Anewbe/syringe 
Syringe adjustments
 2018-03-10 13:28:00 -08:00
Mechoid
2c6d942fea Merge pull request #5031 from Anewbe/mining_drill 
Drill grammar
 2018-03-10 13:14:32 -08:00
Heroman3003
29d20e34eb added icons for improved capacitors and scan. modules (#5029) 2018-03-10 15:07:15 -06:00
Anewbe
9a40d3d413 Merge pull request #5028 from Belsima/dest 
Ward-Takahashi names + Northern Star
 2018-03-10 15:05:21 -06:00
Anewbe
6c2c57fb65 Merge pull request #5044 from VOREStation/vplk-qdel-log-oops 
Reduce qdel log file by 150000%
 2018-03-10 15:04:32 -06: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
Anewbe
940557ee34 Merge pull request #5021 from Nerezza/Hardsuit-fixes 
Misc rig fixes/tweaks
 2018-03-10 14:57:37 -06:00
Anewbe
4dbbd7a88b Merge pull request #5039 from VOREStation/vplk-scheduler-sorted 
Optimize scheduler process by sorting its task list
 2018-03-10 14:55:53 -06:00
Leshana
b666e76d7d Reduce qdel log file by 150000% 
Fix indenting error that caused it to log repeatedly.  Also put it in its own file to match the pattern used by overlays and initialize.
 2018-03-09 23:53:15 -05:00
Anewbe
362ba9ab7e Merge pull request #5035 from Cyantime/patch-1 
Fix click disabling when unbuckling via resist
 2018-03-09 10:34:26 -06:00
Atermonera
5549229191 Merge pull request #5041 from Neerti/3/9/2018_security_is_nice 
Port's /vg/'s RCE prevention to shell().
 2018-03-08 21:59:45 -08:00
Neerti
0a2bf1eb42 Port's /vg/'s RCE prevention. 2018-03-09 00:32:16 -05:00
Leshana
74332405a8 Optimize scheduler process by sorting its task list 
It previously had to iterate over EVERY task in its list every time.   With lots of queued tasks that is slow.
Instead we sort it by schedule time.   That means when iterating thru list, if we get to a single task that is in the future, so are all remaining.
 2018-03-08 22:27:47 -05:00
Arokha Sieyes
8eb4442943 U_I Phase 2.7: Helmet lights, washing blood more 2018-03-08 19:34:02 -05:00
Arokha Sieyes
2970b37fa1 U_I Phase 2.6: Blood, Helmets, Unneeded calls 2018-03-08 19:34:01 -05:00
Leshana
4c5b7655b5 U_I Phase 2.5: Fix *swish deleting tail overlay 
All more cases of "don't call apply/remove multiple times!
 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
96b0416c7f U_I Phase 2.3: Further cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes
ba73fc2550 U_I Phase 2.2: Fix some old calls 2018-03-08 19:33:50 -05:00
Arokha Sieyes
3f13a89b89 U_I Phase 2.1: Fix missing tails, now double tails 2018-03-08 19:33:49 -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
Heroman3003
7023255635 fix for stacks out of stacking machine (#5020) 2018-03-08 13:29:03 -06:00
Cyantime
602a505ec7 Fix click disabling when unbuckling via resist 2018-03-08 18:11:07 +00:00
Anewbe
fa864b1669 Drill grammar 2018-03-07 19:55:02 -06:00
Anewbe
7ed36f51f2 Syringe adjustments 2018-03-07 18:46:50 -06:00
Nerezza
a3228cd0c5 Makes slightly smaller objects capable of bashing open busted APCs (#5015) 
* Makes slightly smaller objects capable of bashing open busted APCs

Because I've realized that engineers have enough --- to deal with without having to hunt down a fire extinguisher to bash open an APC

* Grammaring the best
 2018-03-07 18:07:20 -06:00
Belsima
65779eff44 Ward-Takahashi names + Northern Star 2018-03-07 15:12:51 -05:00
Arokha Sieyes
59def29202 U_I Phase 0.5: Organize and comment 2018-03-07 14:02:59 -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
9dfa7850a5 Merge pull request #5012 from Anewbe/tug_bug 
Should be possible to replace cargo tug power cells
 2018-03-06 13:07:32 -08:00
Atermonera
82a38c7ff6 Merge pull request #5011 from Anewbe/metabolism 
Ingested reagents act half as quickly, rather than half as well
 2018-03-06 13:07:17 -08:00
Atermonera
11b17819f7 Merge pull request #5006 from Anewbe/more_dangerous_animals 
Adjusts probably-temporary attack values for simple mobs
 2018-03-06 13:02:44 -08:00
Anewbe
14f48b84cd VeyMed limbs (and organs) are now more vulnerable to EMP (#4987) 
* VeyMed limbs (and organs) are now more vulnerable to EMP

* Changelog
 2018-03-06 13:02:06 -08:00
Atermonera
982840c14c Merge pull request #4943 from Anewbe/robosparks 
Robolimbs require repair at 30 composite damage
 2018-03-06 13:01:39 -08:00
Nerezza
9d7f7a7e5e Misc rig fixes/tweaks 
EVA suit no longer stores toolboxes because those use a volume inventory.

CE's suit no longer holds pickaxes and ore satchels, but can now hold inflatables.

Adjusted get_breath_from_internal() proc to disable rig internals if the helmet is retracted and no suitable mask is in place.

Adjusted the internals button to ignore offline rigs.
 2018-03-06 13:49:14 -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