cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,943 Commits 9 Branches 0 Tags
b23b51b83aa6adb1931ddde65a6a9414a2954c68
Commit Graph

16163 Commits

Author SHA1 Message Date
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
e9c3be3318 Revert "Bandaid for helper.dm runtime lag" 2020-02-19 01:43:43 -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
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
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
4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -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
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas 
Metamorphic Pint Glass
 2020-02-13 00:31:59 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
d1dbefffc4 Merge pull request #6539 from Meghan-Rossi/bombtesttweak 
Makes explosive simulators give slightly more helpful results for ttvs
 2020-02-12 10:42:47 -05:00
Atermonera
3961c4cdbf Shutoff monitoring console remotely controls valves (#6687) 2020-02-12 00:17:09 -05:00
Novacat
06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05:00
Atermonera
6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Atermonera
0bbc8109ae Merge pull request #6675 from GeneriedJenelle/patch-1 
Logs graffiti and crayon drawings: Non-Cursed PR
 2020-02-09 23:45:06 -05:00
Atermonera
7b20362aaf Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change 
Stunbatons will now only harmbaton on grab/harm intents
 2020-02-09 14:47:00 -05:00
Novacat
7a704616ea Merge pull request #6544 from VOREStation/upstream-merge-6665 
[MIRROR] 2020 Civilian Wing Overhaul
 2020-02-08 16:44:36 -05:00
Novacat
22c0fd363f Update bed.dm 2020-02-08 15:56:26 -05:00
Meghan-Rossi
3935aa3e47 fix conflict causing compile error 2020-02-08 19:32:03 +00:00
Atermonera
637a51edd7 Merge pull request #6676 from Meghan-Rossi/machinefix 
Fix frame deconstruction bugs
 2020-02-08 14:03:53 -05:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Novacat
bd2b049c74 Merge pull request #6543 from Heroman3003/taurlocator 
Also applies taur riding teleport limitation to translocators
 2020-02-07 23:05:38 -05:00
Heroman
b8c07ae29b Also applies taur riding teleport limitation to translocators 2020-02-08 13:35:41 +10:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Meghan-Rossi
8def3fa74a Makes explosive simulators give slightly more helpful results for ttvs 
Explosive simulators results now include the initial contents of both tanks for tank transfer valve simulations.
 2020-02-05 11:10:28 +00:00
Arokha Sieyes
3c5cfa838d Update sleevemate warning message 2020-02-04 20:16:13 -05:00
Atermonera
1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Atermonera
80ec8ac200 Merge pull request #6656 from Amunak/countable-lists 
Prettifies closet contents list with (newly added) countable variant of english_list
 2020-02-01 18:01:23 -05:00
Heroman
38bf0a33c6 Fixes and re-implements Rogue Mining (Belt Mining) 2020-01-23 18:43:20 +10:00
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Novacat
5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628 
[MIRROR] Adds a mega cooking recipe
 2020-01-21 01:26:48 -05:00
Novacat
1ee5865327 Merge pull request #6477 from Rykka-Stormheart/shep-dev-earlyport-mech-fixes 
Earlyport mech fixes, fix Polecat armor issues
 2020-01-21 01:25:44 -05:00
Novacat
7b815bd594 Update radio.dm 2020-01-21 01:23:57 -05:00
Novacat
1b12757e28 Update scrubber.dm 2020-01-21 01:17:21 -05:00
Novacat
d9ada5bc0e Update scrubber.dm 2020-01-21 01:16:11 -05:00
Novacat
18963d3714 Update Sleeper.dm 2020-01-21 01:15:30 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Rykka
0b6ace1a3b Smol grammar fix 2020-01-20 18:24:56 -07:00
Rykka
d0f391c650 Earlyport mech fixes, Fix Polecat armor issues 2020-01-20 18:22:05 -07:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633) 
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
 2020-01-19 00:51:24 -05:00