cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 8 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

16290 Commits

Author SHA1 Message Date
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake 
Fix way too many vorestation edits
 2020-03-05 19:03:58 -05:00
Aronai Sieyes
42dc591215 Merge pull request #6756 from VOREStation/vplk-shuttles 
Landmark Shuttles
 2020-03-05 13:34:56 -05:00
Novacat
7e0849f084 Merge pull request #6765 from VOREStation/aro-wet 
Water -> Wet
 2020-03-05 13:34:29 -05:00
Arokha Sieyes
5b93fe9f10 Water -> Wet 2020-03-05 13:23:01 -05:00
Arokha Sieyes
b1728c5520 Refactor sleevemate 
Allows keeping OOC notes between download/upload of mobs
 2020-03-05 12:24:48 -05:00
Aronai Sieyes
db35a6ec53 Tether map conversion to use landmark shuttles. 
- Updated shuttle datums according to the guide.
- Removed the extra shuttle areas and replaced with shuttle landmarks.
- Updated some custom code.
 2020-03-05 10:29:10 -05:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles. 
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
 2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Heroman3003
dd8f1f6d2b Fixes sofa not refunding any material (#6784) 2020-03-03 15:54:54 -05:00
Heroman
743ae581af Removes _vr only sofa definitions 2020-03-02 13:46:37 +10:00
Novacat
54c792ba9b Merge pull request #6648 from VOREStation/aro-medstand 
Replace IV drips with medical stands
 2020-03-01 10:54:45 -05:00
Novacat
d98cd87585 Merge pull request #6646 from VOREStation/aro-salv 
Add salvageable machines
 2020-03-01 10:54:21 -05:00
Novacat
1b147264d0 Merge pull request #6642 from VOREStation/aro-vends 
A few new vending sprites
 2020-03-01 10:53:51 -05:00
Novacat
f7e3d95286 Merge pull request #6640 from VOREStation/aro-headsets 
New cent/NT headset sprites
 2020-03-01 10:53:37 -05:00
Novacat
ed04dbf730 Merge pull request #6639 from VOREStation/aro-rollers 
New rollerbed sprites
 2020-03-01 10:53:21 -05:00
Novacat
c613176292 Merge pull request #6633 from Heroman3003/podremove 
Replaces emag interaction with pizza voucher
 2020-03-01 10:53:09 -05:00
Novacat
d0b92789be Merge pull request #6628 from VOREStation/aro-chairs 
Add a few new chair types
 2020-03-01 10:52:54 -05:00
Novacat
9daf29e573 Merge pull request #6630 from VOREStation/aro-terminals 
New terminal sprites
 2020-03-01 10:52:39 -05:00
Novacat
65c9b4087f Merge pull request #6627 from VOREStation/aro-carafes 
Adds carafes and pitchers
 2020-03-01 10:52:28 -05:00
Novacat
aabba971c6 Merge pull request #6626 from VOREStation/aro-discicons 
New sprites for discs with unique colors
 2020-03-01 10:52:13 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Novacat
8175d5d17a Merge pull request #6707 from VOREStation/upstream-merge-6765 
[MIRROR] Brainmechs can use guns again.
 2020-02-29 18:54:40 -05:00
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
Atermonera
528ba717b6 Merge pull request #6765 from Mechoid/BrainmechTargFix 
Brainmechs can use guns again.
 2020-02-29 18:04:37 -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
Aronai Sieyes
db04d43f2c Made the new chairs steelsheet constructable 2020-02-29 13:02:43 -05:00
Aronai Sieyes
0d7b1d7240 Fix bug with setting icon for breather 2020-02-29 12:00:48 -05:00
Aronai Sieyes
e5b9cb57de Add additional chairs 2020-02-29 11:46:11 -05:00
Aronai Sieyes
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00
Atermonera
8ced96e75e Merge pull request #6758 from TheFurryFeline/patch-7 
[Oversight] Orion Trail Grammar Fixy
 2020-02-28 20:55:06 -05:00
Novacat
b6c3cb2cdf Compatibility Fix 2020-02-27 23:56:33 -05:00
Atermonera
b1720d2653 Defibrilators can be charged in rechargers 2020-02-27 23:55:07 -05:00
Novacat
7172be1117 Merge pull request #6684 from Heroman3003/pricefix 
Fixes free clothing dispenser only handing shoes for money
 2020-02-27 00:06:46 -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
Novacat
f864ddd3c9 Merge pull request #6687 from VOREStation/upstream-merge-6742 
[MIRROR]  Better spriters for liquid dispensers
 2020-02-26 22:44:57 -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
21e80b9117 Merge pull request #6742 from listerla/dispenser 
Better spriters for liquid dispensers
 2020-02-26 20:29:59 -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
Heroman
ee92277ff7 Fixes free clothing dispenser only handing shoes for moeny 2020-02-27 09:32:03 +10: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
34c8458714 Merge pull request #6678 from VOREStation/upstream-merge-6722 
[MIRROR] Fixes MCs not being rechargable
 2020-02-24 21:13:21 -05:00
Novacat
ab9f71f1a5 Update recharger.dm 2020-02-24 20:29:04 -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
b353ec7d01 Fixes MCs not being rechargable 2020-02-24 16:25:34 -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