cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,000 Commits 10 Branches 0 Tags
48e022ed1b9ab465fa3b3b907a0486d1251cea0c
Commit Graph

36118 Commits

Author SHA1 Message Date
Novacat
48e022ed1b Update new_player.dm 2020-02-24 20:30:09 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Novacat
bfa123c1f0 Merge pull request #6661 from Heroman3003/sofafix 
Makes all sofa colors/subtypes makeable
 2020-02-24 03:35:07 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Heroman
a5653c6eb2 Better fix for the missing accessories on taurs 2020-02-24 17:39:21 +10:00
Novacat
fe844b4d9d Merge pull request #6659 from Heroman3003/idfix2 
Fixes IDs being dropped from cryopods
 2020-02-23 20:27:10 -05:00
Heroman3003
b12348f909 Merge branch 'master' into maint_pred 2020-02-24 11:00:59 +10:00
Heroman
7c2e86f90f Fixes IDs being dropped from cryopods 2020-02-24 10:03:35 +10:00
Novacat
6db588e80d Merge pull request #6658 from Heroman3003/cloakfix 
Fixes cloaks being broken on taurs.
 2020-02-23 19:02:20 -05:00
Heroman
518ccfab5b Fixes cloaks being broken on taurs. 2020-02-24 08:47:31 +10:00
Novacat
4d1a63618c Merge pull request #6653 from VOREStation/upstream-merge-6728 
[MIRROR] Carbon mobs can be attacked again
 2020-02-23 00:53:20 -05:00
Leshana
3c03a71107 Investigate what causes us to bail out early when timer system breaks. 2020-02-23 00:42:56 -05:00
Atermonera
89e23b3218 Carbon mpbs can be attacked again (#6728) 2020-02-22 23:14:03 -05:00
Novacat
d247f88329 Merge pull request #6651 from VOREStation/upstream-merge-6710 
[MIRROR] Ports precision placement of items
 2020-02-22 10:33:58 -05:00
Novacat
6385766328 Update living.dm 2020-02-22 09:50:36 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Atermonera
41f111ea54 Merge pull request #6697 from Heroman3003/scannerfix1 
Fixes missing sprites on forensic scanner
 2020-02-22 02:17:23 -05:00
Trexdude
790d6552f3 Fixes BL-3 Sprite 
Such that it appears as a sprite, and not a debug invisible sprite.
 2020-02-21 11:46:23 -05:00
Novacat
b0c6118a52 Merge pull request #6638 from VOREStation/upstream-merge-6714 
[MIRROR] Renames Make All Areas (Un)Powered secret
 2020-02-21 10:37:48 -05:00
Novacat
aea99134e6 Merge pull request #6636 from VOREStation/upstream-merge-6709 
[MIRROR] [Bugfix?] Bat Attack Spelling Fixy
 2020-02-21 10:37:31 -05:00
Atermonera
a54a7912cb Merge pull request #6714 from Heroman3003/verbrename 
Renames Make All Areas (Un)Powered secret
 2020-02-21 02:27:08 -05:00
Atermonera
9029bcc85e Merge pull request #6709 from TheFurryFeline/patch-6 
[Bugfix?] Bat Attack Spelling Fixy
 2020-02-21 02:14:18 -05:00
Atermonera
1010fd283b Merge pull request #6690 from VOREStation/vplk-ntnet-fixer 
Fixes to Modular Computers and NTNet Relays
 2020-02-21 01:58:20 -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
7298094934 Blue alien ship stuff 2020-02-20 00:45:38 -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
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
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
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
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
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
Heroman3003
07a73c7f23 Lowers cost of ponchos and cloaks in loadout (#6705) 2020-02-19 01:24:51 -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
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
Heroman
a6d6cf7825 More fixes for broken medical 2020-02-19 08:35:37 +10: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
cdd0885c93 Fixes broken tool usability logic for surgery 2020-02-18 18:11:35 +10:00
Leshana
25fd4147c5 Add debugging logs in an effort to track down the Timer subsystem failure point. 
Given unsuccessful attempts to reproduce in testing, we need logging in production. These logging statements can be removed once the root cause is discovered.
 2020-02-17 20:27:26 -05:00
Novacat
11e6ed63a3 Merge pull request #6589 from Meghan-Rossi/fluffstuff 
Fluff items and species whitelisting
 2020-02-17 20:09:55 -05:00
Meghan-Rossi
dfc42293c7 Fluff items and species whitelisting 
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
 2020-02-18 00:27:36 +00:00
Novacat
ed37b715aa Merge pull request #6582 from Novacat/nova-basicfixes 
Replaces Tramadol maint pills with Paracetamol
 2020-02-17 16:12:28 -05:00
Novacat
9bead57015 Merge pull request #6587 from Rykka-Stormheart/shep-dev-air-loop-fix 
Final fix of air pump loop length. 7 x 10 is 70, not 110.
 2020-02-17 16:12:07 -05:00
Rykka
5e2f2db1ed Final fix. I swear. 2020-02-17 14:02:10 -07:00
Arokha Sieyes
14942ee6c7 VS: Don't talk to strangers 2020-02-17 12:44:17 -05:00
Arokha Sieyes
3cbd51c6d1 Don't talk to strangers 2020-02-17 12:44:10 -05:00