cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,332 Commits 5 Branches 0 Tags
342f964e33790d63da310945d8483b1cda917c90
Commit Graph

1970 Commits

Author SHA1 Message Date
Novacat
342f964e33 Update datacore.dm 2020-03-09 01:56:51 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake 
Fix way too many vorestation edits
 2020-03-05 19:03:58 -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
Novacat
1602627443 Merge pull request #6643 from VOREStation/aro-detect 
Add alternative detective wear
 2020-03-01 10:54:03 -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
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
Atermonera
4039e26875 Merge pull request #6755 from Neerti/feedback_for_devs 
Devs can now View Feedback
 2020-02-27 23:56:20 -05:00
Novacat
4298fd39eb Merge pull request #6619 from VOREStation/fix-seeds-runtime 
Fix Sundry Runtime Errors
 2020-02-25 10:42:09 -05:00
Novacat
c38cbe3c36 Merge pull request #6679 from VOREStation/upstream-merge-6719 
[MIRROR] Adds an In-game Feedback System
 2020-02-24 21:13:33 -05:00
Novacat
c93c572c52 Merge pull request #6675 from VOREStation/upstream-merge-6731 
[MIRROR] Adds individual modular armour crates, tweaks old prices
 2020-02-24 20:27:43 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Atermonera
138fe4053b Merge pull request #6731 from FenodyreeAv/CargoChange 
Adds individual modular armour crates, tweaks old prices
 2020-02-24 16:17:41 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo 
Fix and tweak station Railguns.
 2020-02-24 16:15:04 -05:00
Leshana
9f98153dce Fix Runtime in wires.dm,120: Cannot execute null.is wirecutter(). 2020-02-23 22:03:21 -05:00
Heroman3003
b12348f909 Merge branch 'master' into maint_pred 2020-02-24 11:00:59 +10:00
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
Aronai Sieyes
e9750627aa Add to authpathe 2020-02-20 22:34:22 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Rykka
5e2f2db1ed Final fix. I swear. 2020-02-17 14:02:10 -07: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
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
Heroman
8ac52fef61 Adds Maintenance Predator random event 2020-02-12 12:33:46 +10:00
Novacat
12a412be47 Merge pull request #6519 from Heroman3003/beltminecrate 
QoL to supplypacks related to Belt Mining
 2020-02-10 11:06:20 -05:00
Spades
ddc544205d Merge pull request #6429 from Heroman3003/morphevent 
Adds Morph Spawn event
 2020-02-10 07:21:57 -05:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Heroman
32a30fa527 Moves jetpack into its own expensive crate 2020-02-01 09:21:30 +10:00
Heroman
2144e95ca7 Increases amount of supplies in belt mining crate 2020-01-31 15:32:50 +10:00
Heroman
a733980a6e Merge branch 'master' of https://github.com/VOREStation/VOREStation into morphevent 2020-01-28 12:43:47 +10:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Heroman3003
4af118cb0d Merge branch 'master' into morphevent 2020-01-16 09:00:43 +10:00
Heroman
181331d166 Earlyports fix for barista missing access 2020-01-15 04:48:41 +10:00
Novacat
7344a6f953 WE ALWAYS DELIVER!! 2020-01-12 22:02:04 -05:00
Heroman
43760db7dd Adds Morph Spawn event 2020-01-11 20:15:10 +10:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Novacat
658c0560c8 Merge pull request #6380 from Heroman3003/vore_laws 
Adds some vorish silicon lawsets
 2020-01-09 22:50:58 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Atermonera
f67866957f Merge pull request #6602 from Heroman3003/legcuffening 
Makes legcuffs printable in hacked autolathe
 2020-01-08 13:48:55 -05:00
ketraiski
b714419bf3 makes the cargo order plop out a filled machine. 2020-01-08 10:25:44 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Heroman
2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
Heroman
387fa7e898 Adjusts Eradicator law 3 wording 2020-01-03 12:44:56 +10:00
Heroman
1d6a57bbfd Typos and slight rewordings 2020-01-03 07:46:01 +10:00