cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,441 Commits 8 Branches 0 Tags
c7a6904fce3b09ece8cf28166d49bf16d5177e12
Commit Graph

31455 Commits

Author SHA1 Message Date
Aronai Sieyes
d70c8c48c3 Merge pull request #3218 from VOREStation/vplk-runtime-fixes 
Runtime Fixes - March
 2018-03-12 18:28:20 -04:00
Aronai Sieyes
7555fb240c Merge pull request #3214 from Little-119/multi-bug-fixing 
Fixes #3209, fixes the cancel button in ears/wings/tail selection clearing the respective selection
 2018-03-12 18:27:58 -04:00
Aronai Sieyes
74bda5de54 Merge pull request #3212 from VOREStation/aro-subtlesani 
HTMLDecode vorestation log types
 2018-03-12 18:27:47 -04:00
Aronai Sieyes
540bfecf9e Merge pull request #3211 from VOREStation/aro-topic 
POLARIS: Move Topic() log to debug_log
 2018-03-12 18:27:39 -04:00
Aronai Sieyes
99022117dc Merge pull request #3206 from Mewchild/rdcomms 
Gives RD explorer comms
 2018-03-12 18:27:00 -04:00
Aronai Sieyes
d2c3bc8539 Merge pull request #3208 from VOREStation/aro-rechgr 
Prevent ghosts from ejecting borgs from rechargers
 2018-03-12 18:26:48 -04:00
Arokha Sieyes
949ea35aa7 VS: Changes for tooltips 2018-03-12 18:26:09 -04:00
Arokha Sieyes
428db6c271 POLARIS: Tooltip framework, and mob tooltips 2018-03-12 18:25:53 -04:00
Neerti
cc80fddfe1 Merge pull request #5054 from PolarisSS13/br-2 
Ater missed another <br>
 2018-03-12 18:23:51 -04:00
Andrew
094fc568dc Fixes Durasteel Producing Slag 2018-03-12 15:01:28 -05:00
Arokha Sieyes
bcf962fc32 POLARIS: Readd include_name param on keyname because it's used for other things 2018-03-12 11:33:58 -04:00
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
Atermonera
cb37f7d36c Ater missed another <br> 2018-03-11 19:26:08 -07: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
2bea97d328 Reduce lightweight trait point return 2018-03-11 21:41:43 -04:00
Arokha Sieyes
e4ec74af34 VS: Announce tes/singuloose in adminchat 2018-03-11 21:33:31 -04:00
Arokha Sieyes
82a0d86cf9 POLARIS: Log more engine info 2018-03-11 21:33:31 -04: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
Leshana
f2fff2358b Fix DEBUG: Runtime in syringes_vr.dm,17: Cannot execute null.Cut() 2018-03-11 16:56:16 -04:00
Screemonster
5749b3b2a7 Makes the monstertamer/clonexadone reaction force hatching too 2018-03-11 20:20:38 +00:00
Little-119
509474fcd6 Changes the shadekin empathy key from s to m, to fix sign language 2018-03-11 04:31:19 -04:00
Little-119
3e92f000f7 Fixes the cancel button in ears/wings/tail selection clearing the respective selection 2018-03-11 04:29:07 -04:00
Mechoid
edab848f2f Merge pull request #5024 from Anewbe/random_spawners 
Splits up random.dm
 2018-03-10 19:07:47 -08:00
Arokha Sieyes
ef37b4b307 VS: HTMLDecode vorestation log types 2018-03-10 21:27:37 -05:00
Arokha Sieyes
11e4592a75 POLARIS: Move Topic() log to debug_log 2018-03-10 20:52:12 -05:00
Arokha Sieyes
119381e14b POLARIS: Prevent ghosts from ejecting borgs from rechargers 2018-03-10 18:39:11 -05:00
Mewchild
e129f03b42 Gives RD explorer comms 2018-03-10 16:52:52 -06:00
Arokha Sieyes
fae2b48eab POLARIS: Moves daily logs into being folders rather than files 2018-03-10 17:18:55 -05:00
Arokha Sieyes
46f4022852 VS: Consistent logging changes to match polaris commit 2018-03-10 17:18:09 -05:00
Arokha Sieyes
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05: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
Aronai Sieyes
54cf9636ec Merge pull request #3189 from Verkister/moreborgostuff 
Readies our borg stuff for next sync fixes.
 2018-03-10 15:01:04 -05:00
JOAN-RIG\Joan Risu
f5e2039dd5 removed invalid if statement from gunbuster. 2018-03-09 23:37:52 -08: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
Leshana
c134f8ad65 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:50:43 -05:00
Verkister
f54383b995 vr 2018-03-09 22:59:47 +02:00
Verkister
e6ea9e3bda Merge branch 'master' into smvf 2018-03-09 22:17:57 +02:00
Aronai Sieyes
8ff288669d Merge pull request #3128 from aztectornado/hollow-bones 
Adds hollow bones trait
 2018-03-09 14:34:07 -05:00
Aronai Sieyes
432f1f02eb Merge pull request #3198 from VOREStation/aro-droploc 
Implement drop_location(), some vore fixes
 2018-03-09 14:32:15 -05:00