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
50,246 Commits 5 Branches 0 Tags
c9f77d563f9e88c3c333de78870d8df0c9728360
Commit Graph

23935 Commits

Author SHA1 Message Date
Novacat
c9f77d563f Merge pull request #6745 from VOREStation/upstream-merge-6774 
[MIRROR] Sprite fixes
 2020-03-03 02:11:54 -05:00
Novacat
440a739ef9 Merge pull request #6744 from VOREStation/upstream-merge-6772 
[MIRROR] Fixes a teshari mining undercoat
 2020-03-03 01:51:05 -05:00
Atermonera
7f5f8daf1b Merge pull request #6774 from Schnayy/spritefix-march 
Sprite fixes
 2020-03-03 01:47:45 -05:00
Atermonera
882aeee371 Merge pull request #6772 from Heroman3003/teshfix 
Fixes a teshari mining undercoat
 2020-03-03 01:38:13 -05:00
Atermonera
2af53022fe Merge pull request #6770 from Mechoid/ReadyUpNotice 
High-priority Job Display
 2020-03-03 01:37:00 -05:00
Novacat
7b742ecfd5 Merge pull request #6740 from Wickedtemp/master 
Extends Tempest's hypo and glasses whitelists to Off-duty Medic
 2020-03-02 00:20:47 -05:00
Wickedtemp
40e2518633 Update loadout_fluffitems_vr.dm 2020-03-01 21:48:12 -06:00
Heroman
0586676320 Fixes Pip's ears 2020-03-02 12:58:52 +10:00
Novacat
d8d1349b64 Merge pull request #6732 from VOREStation/aro-vcunderline 
Underline links in VChat and fix LOOC color
 2020-03-01 19:50:12 -05:00
Aronai Sieyes
4395a8ebcf Fix LOOC color 2020-03-01 19:41:46 -05:00
Aronai Sieyes
9ba8c91653 Merge pull request #6731 from VOREStation/aro-moremedstand 
Fix building med stands
 2020-03-01 19:35:09 -05:00
Aronai Sieyes
61477ec131 Underline links in VChat 2020-03-01 19:34:44 -05:00
Aronai Sieyes
a320b2ecd5 Merge pull request #6730 from VOREStation/aro-vbugs1 
Fixes 2 VChat bugs
 2020-03-01 19:22:21 -05:00
Aronai Sieyes
c03532be58 Fixes missed commenting out of line 2020-03-01 19:21:44 -05:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Aronai Sieyes
4ae6283cd1 Fixes 2 VChat bugs 2020-03-01 19:05:52 -05:00
Aronai Sieyes
f71bfa7100 Ore Scanner is written incorrectly 
Only revealed by vchat
 2020-03-01 17:22:31 -05:00
Novacat
95e1c84036 Merge pull request #6719 from VOREStation/aro-narrate 
Allow narrate/globalnarrate shenanigans
 2020-03-01 16:14:01 -05:00
Novacat
c7573caf08 Merge pull request #6720 from VOREStation/aro-bicontweak 
Disable bicon() icon object cache, and create text tag cache
 2020-03-01 16:13:51 -05:00
Novacat
52e543fbf2 Merge pull request #6721 from VOREStation/aro-aibugtweaks 
Few AI runtime fixes
 2020-03-01 16:13:38 -05:00
Aronai Sieyes
2e6fa059c1 VS: AI Tweak bugfixes 2020-03-01 15:14:23 -05:00
Aronai Sieyes
affcbbde5f AI Tweak bugfixes 2020-03-01 15:14:15 -05:00
Aronai Sieyes
a5af4695fc Disable bicon() icon object cache, and create text tag cache 2020-03-01 15:02:08 -05:00
Novacat
3fa10f8a9d Merge pull request #6717 from VOREStation/aro-nano 
NanoUI Subsystem Fixes
 2020-03-01 14:38:00 -05:00
Aronai Sieyes
b33c359df5 Allow narrate/globalnarrate shenanigans 
Allows HTML if your entire thing is HTML
 2020-03-01 14:35:31 -05:00
Aronai Sieyes
7a5cf8d8b2 Remove sergal comic sans 
Oops.
 2020-03-01 14:19:16 -05:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes 
Don't do this, the asset subsystem does this for you
 2020-03-01 14:14:52 -05:00
Novacat
41bbefddb4 Merge pull request #6713 from Novacat/nova-basicfixes 
Fixes runtimes with chemspill map
 2020-03-01 10:56:09 -05:00
Novacat
85d7b3d8f1 Merge pull request #6657 from VOREStation/aro-customtabs 
Adds 3 additional tablet types
 2020-03-01 10:55:00 -05:00
Novacat
82fb69489a Merge pull request #6647 from VOREStation/aro-table 
Additional table type
 2020-03-01 10:54:31 -05:00
Novacat
1602627443 Merge pull request #6643 from VOREStation/aro-detect 
Add alternative detective wear
 2020-03-01 10:54:03 -05:00
Novacat
d0b92789be Merge pull request #6628 from VOREStation/aro-chairs 
Add a few new chair types
 2020-03-01 10:52:54 -05:00
Novacat
9daf29e573 Merge pull request #6630 from VOREStation/aro-terminals 
New terminal sprites
 2020-03-01 10:52:39 -05:00
Novacat
65c9b4087f Merge pull request #6627 from VOREStation/aro-carafes 
Adds carafes and pitchers
 2020-03-01 10:52:28 -05:00
Novacat
aabba971c6 Merge pull request #6626 from VOREStation/aro-discicons 
New sprites for discs with unique colors
 2020-03-01 10:52:13 -05:00
Novacat
554ddbb7ff Merge pull request #6625 from VOREStation/aro-beuro 
New folders/pen/clipboard sprites
 2020-03-01 10:51:59 -05:00
Novacat
dd23477faa Merge pull request #6624 from VOREStation/aro-customtops 
Replace/add laptop sprites
 2020-03-01 10:51:45 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Unknown
fc3cc9517e Earlyports rig surgery fix 2020-03-01 00:48:49 -05:00
Novacat
434addc667 Merge pull request #6712 from Heroman3003/pipitems 
[Approval Pending] Implements Pip Shyner's fluff items
 2020-03-01 00:24:56 -05:00
Heroman
df83acadfc Adds Pip's Ears 2020-03-01 12:46:52 +10:00
Heroman
3885feb245 Fixes cloaks on taurs again AGAIN 2020-03-01 12:32:54 +10:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00
Aronai Sieyes
39d0a8490f Fix madness 2020-02-29 20:00:16 -05:00
Novacat
c63ba4a349 Nerfs Chameleon Kit Boxes (#6763) 
* Nerfs Chameleon Kit Boxes

Because of the way chameleon kits start with items, the boxes start with a ton of storage slots to hold all the items. Sometimes people grab the boxes, dump out the original contents and stuff a ton of stuff into them as a result.

This refactors it so that all the chameleon stuff starts in the backpack instead, so chameleon kit boxes themselves are no longer superboxes

* Unnecessary comma
 2020-02-29 18:02:21 -05:00
Aronai Sieyes
bef16f2864 Cleanup the DB in case it wasn't deleted each roundstart 2020-02-29 15:02:54 -05:00
Aronai Sieyes
97d312a3dd Reduce fallback time in case of linux users etc 2020-02-29 14:23:03 -05:00
Aronai Sieyes
db04d43f2c Made the new chairs steelsheet constructable 2020-02-29 13:02:43 -05:00
Aronai Sieyes
243e7353c5 Swap elite and hybrid laptop sprites 2020-02-29 12:07:11 -05:00
Aronai Sieyes
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00