cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

49961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aronai Sieyes
b3b51a7c3a New sprites for discs with unique colors 
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
 2020-02-20 21:37:15 -05:00
Aronai Sieyes
a41caca3ca Merge pull request #6623 from VOREStation/aro-minitestntnet 
Add NTNet to Virgo Minitest Map
 2020-02-20 20:58:23 -05:00
Aronai Sieyes
3c3f4fa8c9 Add NTNet to Virgo Minitest Map 
Just throws a relay in there.
 2020-02-20 20:02:07 -05:00
Novacat
49b727720f Merge pull request #6620 from VOREStation/bluealien 
Adds a blue version of alien turfs
 2020-02-20 01:13:47 -05:00
Arokha Sieyes
ae33962db5 Update lewdshuttles to hybrid variant 2020-02-20 00:55:45 -05:00
Arokha Sieyes
7298094934 Blue alien ship stuff 2020-02-20 00:45:38 -05:00
Novacat
3b8960d72a Merge pull request #6618 from Novacat/nova-basicfixes 
Minor Protean Balans Tweaks
 2020-02-19 21:51:14 -05:00
Unknown
146d7ec7e1 Minor Protean Balans Tweaks 
- Boosts limb health to be roughly the same as Prometheans
- Gives slight brute resist
- Slightly reduces burn weakness
 2020-02-19 20:22:28 -05:00
Aronai Sieyes
7cb66cd9c9 Merge pull request #6617 from VOREStation/tochattypo 
Fix to_chat typo
 2020-02-19 19:47:20 -05:00
Novacat
ce7a1db6a2 Merge pull request #6616 from VOREStation/upstream-merge-6711 
[MIRROR] Revert "Fix runtime in helper.dm,92"
 2020-02-19 19:40:14 -05:00
Arokha Sieyes
9fadae4392 Fix to_chat typo 
This file is unchecked so it's not being used, but I'd still rather not leave this.

(cherry picked from commit 00b61d9bcb36e08aca10d72dcf0e2d00655a9527)
 2020-02-19 19:36:14 -05:00
VirgoBot
63c6695316 Revert "Fix runtime in helper.dm,92" 2020-02-19 19:27:11 -05:00
Atermonera
224d45f3bc Merge pull request #6711 from PolarisSS13/revert-6706-vplk-fix-commnews 
Revert "Fix runtime in helper.dm,92"
 2020-02-19 19:27:11 -05:00
Novacat
225e2c54af Merge pull request #6614 from TheFurryFeline/TFF-Surface_Cargo_Office_Sofa_Fixy 
[Map] Sofa Fix
 2020-02-19 14:52:43 -05:00
Novacat
c9f1292253 Merge pull request #6615 from VOREStation/upstream-merge-6694 
[MIRROR] canes and crutches
 2020-02-19 14:52:28 -05:00
VirgoBot
1bbbc4280c canes and crutches 2020-02-19 14:34:41 -05:00
Greenjoe12345
3391de2f42 canes and crutches (#6694) 
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout

* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider

added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup

* fixed a spelling error
 2020-02-19 14:34:41 -05:00
TheFurryFeline
b296b753fa *screm 
Two sofas were botched up, whoops.
 2020-02-19 11:18:14 -05:00
TheFurryFeline
b23b51b83a Sofa Fix 
Whoops, looks like this sofa got messed up, dir-wise.

Changelog Notes:

- Fixes dir var for sofa in Surface Cargo Office.
 2020-02-19 11:14:30 -05:00
Novacat
a5696aa0b0 Merge pull request #6613 from VOREStation/revert-5680-Verkister-patch-6 
Revert "Bandaid for helper.dm runtime lag"
 2020-02-19 01:54:40 -05:00
Novacat
2f2184b77e Merge pull request #6612 from VOREStation/upstream-merge-6706 
[MIRROR] Fix runtime in helper.dm,92
 2020-02-19 01:47:09 -05:00
Novacat
e9c3be3318 Revert "Bandaid for helper.dm runtime lag" 2020-02-19 01:43:43 -05:00
Novacat
11252f50c4 Merge pull request #6611 from VOREStation/upstream-merge-6705 
[MIRROR] Lowers cost of ponchos and cloaks in loadout
 2020-02-19 01:40:36 -05:00
Novacat
3323737bb7 Merge pull request #6610 from VOREStation/upstream-merge-6699 
[MIRROR] New crab sprites + carp recolor + movement sprites
 2020-02-19 01:38:22 -05:00
Novacat
1af8c51bf3 Merge pull request #6609 from VOREStation/upstream-merge-6700 
[MIRROR] Fix Air Pump loop sound stacking multiple times per pump.
 2020-02-19 01:33:17 -05:00
Novacat
a2068987a8 Merge pull request #6608 from VOREStation/upstream-merge-6704 
[MIRROR] Update and document GLOB macros
 2020-02-19 01:28:20 -05:00
VirgoBot
ea93094668 Fix runtime in helper.dm,92 2020-02-19 01:26:05 -05:00
Leshana
93cba6c326 Fix runtime in helper.dm,92 (#6706) 
Lists in byond are 1-indexed not 0-indexed.
 2020-02-19 01:26:05 -05:00
VirgoBot
98079d1f19 Lowers cost of ponchos and cloaks in loadout 2020-02-19 01:24:51 -05:00
Heroman3003
07a73c7f23 Lowers cost of ponchos and cloaks in loadout (#6705) 2020-02-19 01:24:51 -05:00
Novacat
e276ad602f Merge pull request #6607 from VOREStation/upstream-merge-6695 
[MIRROR] changelog!
 2020-02-19 01:23:21 -05:00
VirgoBot
1502427fa7 New crab sprites + carp recolor + movement sprites 2020-02-19 01:22:34 -05:00
listerla
17cdb5c09b New crab sprites + carp recolor + movement sprites (#6699) 
* New crab sprites + movement sprites

Ported from the World Server and Paradise.

* carp shading

Ported from TGstation

* gray mouse animation fix
 2020-02-19 01:22:34 -05:00
Rykka Stormheart
552a33cbe8 Fix Air Pump loop sound stacking multiple times per pump. 2020-02-19 01:20:18 -05:00
VirgoBot
a13fd19021 Update and document GLOB macros 2020-02-19 01:14:53 -05:00
Leshana
0aff9dc9ee Update and document GLOB macros (#6704) 
* Ports avoiding overwriting raw globals with null during global init.

* From tgstation/tgstation#31882
* Previously globals declared without an initial value would get set to
 null when globals are initialized.  This might be fine, but typically if
 a global isn't given an initial value at declaration its because other
 (probably legacy) code intends to initialize it.  That code might run
 before global variable initialization, and thus be overwritten with null
 when global variables initialize.

* Adds comments and global typed lists to GLOB macros

* Credit to tgstation/tgstation#38893 and tgstation/tgstation#44825
* Document what the global var declaration macros do.
* Add macros to declare typed global lists.
 2020-02-19 01:14:53 -05:00
VirgoBot
6b554e26d5 changelog! 2020-02-19 01:10:33 -05:00
Atermonera
cad3db6238 changelog! (#6695) 2020-02-19 01:10:33 -05:00
Novacat
db7eab2951 Merge pull request #6604 from VOREStation/upstream-merge-6707 
[MIRROR] Fixes broken tool usability logic
 2020-02-18 22:08:39 -05:00
Novacat
d27f527a26 Update item_attack.dm 2020-02-18 21:39:01 -05:00
Atermonera
ee6f155892 Fixes broken tool usability logic 2020-02-18 21:34:24 -05:00
Novacat
04e273910c Merge pull request #6601 from Heroman3003/medfix 
More fixes for broken medical
 2020-02-18 18:16:01 -05:00
Heroman
a6d6cf7825 More fixes for broken medical 2020-02-19 08:35:37 +10:00
Aronai Sieyes
ffefb8b486 Merge pull request #6599 from Heroman3003/iconfix 
Fixes some shuttle chairs still having broken icons
 2020-02-18 14:16:09 -05:00
Aronai Sieyes
24ebfa36f1 Merge pull request #6581 from Heroman3003/pluspineapple 
Adds pineapple pizza to pizza voucher pool
 2020-02-18 14:08:53 -05:00
Heroman
b3ab8938f0 Fixes some shuttle chairs still having broken icons 2020-02-19 04:56:28 +10:00
Novacat
1f357d58da Merge pull request #6597 from Heroman3003/master 
Fixes broken optable light in surface medical
 2020-02-18 09:05:57 -05:00
Novacat
aefff4d18e Merge pull request #6596 from Heroman3003/surgfix 
Fixes broken tool usability logic for surgery
 2020-02-18 09:05:44 -05:00
Heroman
ed414bad57 Fixes broken optable light in surface medical 2020-02-18 18:16:22 +10:00
Heroman
cdd0885c93 Fixes broken tool usability logic for surgery 2020-02-18 18:11:35 +10:00