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

36093 Commits

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
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
Novacat
af6a2b5e55 Merge pull request #6583 from VOREStation/upstream-merge-6693 
[MIRROR] Fixes mining borg ore box movement astral sorcery
 2020-02-17 11:45:26 -05:00
Rykka
39567d75e2 EARLYPORT: Fix Air Pump loop sound stacking multiple times per pump. 
Turns out that the # was so, so, so far off. It was acting as if it was 0.4 seconds per loop, for an 11 SECOND SOUND FILE.

My bad.
Earlyport of https://github.com/PolarisSS13/Polaris/pull/6700
 2020-02-17 02:59:13 -07:00
Novacat
33570d10e6 Update ore_box.dm 2020-02-17 01:33:15 -05:00
Novacat
332e3271d9 Update ore_box.dm 2020-02-17 01:31:48 -05:00
Novacat
e8526a420c Update robot.dm 2020-02-17 01:30:10 -05:00
Novacat
5ea36b7a60 Update robot_movement.dm 2020-02-17 01:29:20 -05:00
Heroman3003
57b7302ea1 Fixes null empty supplypack appearing in last category (#6698) 2020-02-17 01:19:44 -05:00
Atermonera
c5b6dfa259 Fixes mining borg ore box movement astral sorcery 2020-02-17 01:18:31 -05:00
Unknown
a5f3776a91 adds _vr to trash pile 2020-02-17 00:01:50 -05:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman
ae21ea53f5 AND DELETES ORIGINAL 2020-02-16 04:58:48 +10:00
Heroman
10e3dd6368 Moves falling datum for pizza delviery to voucher file 2020-02-16 04:58:32 +10:00
Heroman
e162f75286 Adds pineapple pizza to pizza voucher pool 2020-02-16 04:55:40 +10:00
Novacat
106711b0f3 Merge pull request #6508 from VOREStation/Verkister-patch-7 
A ban-flinging QoL update
 2020-02-14 20:53:25 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Novacat
db2e0bf71c Merge pull request #6573 from Heroman3003/hard-safety 
Prevents resleeving sickness from affecting hardvore victims
 2020-02-14 09:35:58 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -05:00
Novacat
1c459d7416 Merge pull request #6572 from VOREStation/upstream-merge-6689 
[MIRROR] cash registers and retail scanners show transaction totals on examine
 2020-02-14 09:33:01 -05:00
Novacat
1c4d942f1b Merge pull request #6571 from VOREStation/upstream-merge-6682 
[MIRROR] Adds pineapple pizza box
 2020-02-14 09:32:40 -05:00
Atermonera
600e62d137 Fixes runtime in frame.dm, line 509: Cannot read null.len (#6691) 
* Fixes runtime in frame.dm, line 509: Cannot read null.len

* Update frame.dm
 2020-02-14 03:45:42 -05:00
Heroman
b09c8c5a38 Prevents resleeving sickness from affecting hardvore victims 2020-02-14 10:07:02 +10:00
Atermonera
20f60c4a8b cash registers and retail scanners show transaction totals on examine (#6689) 2020-02-13 17:11:53 -05:00