cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,139 Commits 7 Branches 0 Tags
df83acadfcc7d858225828bc9783688045258ae6
Commit Graph

8187 Commits

Author SHA1 Message Date
Novacat
b1669f3674 Merge pull request #6708 from VOREStation/upstream-merge-6713 
[MIRROR] Fixes communicator newsfeed app.
 2020-02-29 18:54:22 -05:00
Atermonera
b1e33cd82a Fixes communicator newsfeed app. (#6713) 
* Fixes communicator newsfeed app.
Fixes non-terminal while loop in get_latest_news(), helper.dm
Newscaster posts now have a world.time-esque timestamp number, so they can be (almost) uniquely identified

* whoopsie
 2020-02-29 18:05:50 -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
Atermonera
b1720d2653 Defibrilators can be charged in rechargers 2020-02-27 23:55:07 -05:00
Novacat
aad8aada9f Merge pull request #6690 from VOREStation/upstream-merge-6744 
[MIRROR] Adds holoPDA from Aurora
 2020-02-26 22:45:53 -05:00
Atermonera
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Atermonera
695ea645fe Merge pull request #6740 from Heroman3003/orangeyellow 
Adds orange and yellow cloth materials
 2020-02-26 20:26:40 -05:00
Novacat
1c80ed2a88 Merge pull request #6622 from Shadow-Quill/Holowarrant 
Holowarrants can now only be authorized by an ID with HoS access
 2020-02-25 10:50:30 -05:00
Novacat
c545032a5f Merge pull request #6677 from VOREStation/upstream-merge-6737 
[MIRROR]  Makes pen click when you click on them
 2020-02-24 20:28:15 -05:00
Novacat
650007f9e7 Merge pull request #6672 from VOREStation/upstream-merge-6729 
[MIRROR] Fix and tweak station Railguns.
 2020-02-24 20:26:32 -05:00
Novacat
97b86d4d1d Merge pull request #6670 from VOREStation/upstream-merge-6726 
[MIRROR] Adds holster, lighter, and seatbelt sounds from World Server.
 2020-02-24 20:25:57 -05:00
Novacat
d4a8a9332b Merge pull request #6666 from VOREStation/upstream-merge-6718 
[MIRROR] Added two chemical spill PoIs + More Immersive PoI Names
 2020-02-24 20:24:35 -05:00
Atermonera
cc487ceebf Merge pull request #6737 from listerla/penclick 
Makes pen click when you click on them
 2020-02-24 16:20:09 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo 
Fix and tweak station Railguns.
 2020-02-24 16:15:04 -05:00
Atermonera
16183867df Adds holster, lighter, and seatbelt sounds from World Server. 2020-02-24 16:12:37 -05:00
Atermonera
5e2a692610 Added two chemical spill PoIs + More Immersive PoI Names 2020-02-24 16:02:31 -05:00
Atermonera
b26daf5fb1 Hide items in plant pots and plushies 2020-02-24 16:01:08 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Heroman
7c2e86f90f Fixes IDs being dropped from cryopods 2020-02-24 10:03:35 +10:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -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
Shadow
b95c2261b2 Holowarrants 2020-02-20 16:04:51 -06: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
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
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -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
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
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
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