cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,416 Commits 5 Branches 0 Tags
80f7f3afb23bb992f37e428375c5220456264a25
Commit Graph

36393 Commits

Author SHA1 Message Date
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Aronai Sieyes
ba15309e2c Merge pull request #6803 from Novacat/nova-pathfinder 
Buffs ERT Backpack
 2020-03-11 20:15:47 -04:00
Aronai Sieyes
28c9ff82fa Merge pull request #6808 from VOREStation/vplk-overmap 
Overmap Skybox, Ships, Sectors, and Boats
 2020-03-11 20:15:09 -04:00
Novacat
75f46123b2 Merge pull request #6813 from VOREStation/aro-tabsave 
Adds VChat tab saving
 2020-03-11 20:00:01 -04:00
Heroman
02b5b85c70 Also adds description for CCO 2020-03-12 09:45:58 +10:00
Heroman
7fb347f935 Fixes _vr only job things 2020-03-12 09:43:00 +10:00
Aronai Sieyes
d6583f4d30 Adds VChat tab saving 
Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc.
 2020-03-11 19:27:14 -04:00
Novacat
ec219ac54d Merge pull request #6811 from VOREStation/upstream-merge-6725 
[MIRROR] Job description alt
 2020-03-11 18:59:08 -04:00
Unknown
cc12748ed5 Changes CCO management 2020-03-11 18:17:10 -04:00
Novacat
fb0e8f2c1d Update assistant.dm 2020-03-11 17:52:13 -04:00
Novacat
ddf28fad89 Update civilian.dm 2020-03-11 17:51:33 -04:00
Novacat
de8f79dd51 Merge pull request #6812 from VOREStation/upstream-merge-6775 
[MIRROR] Robotics Expansion: RIG-ged and Ready
 2020-03-11 17:50:49 -04:00
Aronai Sieyes
52f6286256 Our one special VR construct moves to mechfab, and remove dupes 2020-03-11 16:35:05 -04:00
Aronai Sieyes
8e784cc13a Move our VR stuff into 'specific' files 2020-03-11 16:34:45 -04:00
Aronai Sieyes
86751ec8bd Algae generator produces graphite instead 2020-03-11 16:33:38 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Atermonera
fa8c9fabab Job description alt 2020-03-11 15:55:05 -04:00
Atermonera
22b8bf18c6 Merge pull request #6786 from Mechoid/StabilizerStabilizes 
Stabilizer stabilizes stably
 2020-03-11 15:52:48 -04:00
Aronai Sieyes
465bce2dd4 Rebalance gas/ion thrusters 2020-03-11 11:11:43 -04:00
Aronai Sieyes
0e2346ce8c Make transit look nicer with transit dust 2020-03-11 11:11:43 -04:00
Aronai Sieyes
432ec47f75 More docking codes features 
- Adds docking codes to normal shuttles naoui.
- Adds docking codes sheet of paper.
 2020-03-11 11:11:40 -04:00
Leshana
9cbdf184ff Ported Basic Overmap Functionality 
- Ports the overmap, ships, sectors, and "landable" ships from baystation.
- Ports necessary computers to control ships and overmap shuttles.
- Shims missing machine and computer functionality pending future enhancements.
- Includes required new sprites and sounds.
 2020-03-11 11:11:40 -04:00
Leshana
86c435f4b7 Ports Skybox Parallax 
- Port based on Baystation's implementation and customized for our code and usages.
- Switched space icon_state permutation to a "dust" overlay that is permutated the same way. As an overlay, the dust can be *above* the parallax planes. Space turfs are now white to allow skybox to BLEND_MULTIPLY onto them.
- Added skybox hud effect that replaces background space turfs with an image moved to create a parallax effect.
- Added skybox subsystem to generate and manage skybox parallax images, and lots of images for it!
 2020-03-11 11:11:40 -04:00
Novacat
588455b27d Merge pull request #6807 from VOREStation/upstream-merge-6807 
[MIRROR] QoL: Comms Consoles
 2020-03-11 09:53:19 -04:00
Atermonera
ee32bfcf23 Merge pull request #6807 from Neerti/multiline_command_stuff 
QoL: Comms Consoles
 2020-03-11 02:10:40 -04:00
ZekeSulastin
84f161a6f2 Fixes pregame loop with no readied players (#6814) 
When the config option for pregame time was added in #6795, the
pregame_timeleft setting was moved out of the do while !setup loop.
If the game does not set up, it would keep decrementing the counter
into the negatives since it was never reset.
 2020-03-11 01:36:01 -04:00
Unknown
ad836beff3 Buffs ERT Backpack 
I always thought it strange that the ERT had both their own backpacks, and access to the unquestionably superior Syndicate dufflebags.

This buffs the ERT Backpack to be on par with the syndicate dufflebag. Long term plan is to remove the Syndicate dufflebags from the ERT Armory, but that cannot be done yet due to the mapping freeze.
 2020-03-10 23:03:28 -04:00
Atermonera
e57c1a0e19 Merge pull request #6812 from PolarisSS13/more_buttons 
Gives +MOD the traitor panel and colorable OOC.
 2020-03-10 21:19:13 -04:00
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1 
Cooking adjustments
 2020-03-10 18:41:02 -04:00
Arokha Sieyes
202cdfe2e0 Fix modular computer icons 2020-03-10 11:29:59 -04:00
Novacat
848d102d92 Merge pull request #6792 from Novacat/nova-pathfinder 
Mob bellytexts by Xander
 2020-03-10 10:56:05 -04:00
Novacat
e37c0b854d Merge pull request #6796 from VOREStation/upstream-merge-6797 
[MIRROR] Fixed menthol cigarette runtime
 2020-03-10 10:52:06 -04:00
Novacat
85fddfda9e Merge pull request #6794 from VOREStation/upstream-merge-6798 
[MIRROR] Ports Rollerbed Sprites from Vore
 2020-03-10 10:51:53 -04:00
Unknown
be8c05f2c7 Removes redundancy 2020-03-10 10:10:33 -04:00
Novacat
53b19470ce Update Chemistry-Reagents-Medicine.dm 2020-03-10 10:02:10 -04:00
Novacat
928373c33a Merge pull request #6795 from VOREStation/upstream-merge-6796 
[MIRROR] Oct-Feb News Update
 2020-03-10 10:01:38 -04:00
Atermonera
942cc04433 Merge pull request #6800 from Cerebulon/spiderstomp 
Allows Spiderlings to be Stomped
 2020-03-10 03:46:29 -04:00
Atermonera
7d522fe449 Fixed menthol cigarette runtime 2020-03-10 03:41:06 -04:00
Atermonera
6bcb84b44a Merge pull request #6796 from Cerebulon/newsUpdatemar2020 
Oct-Feb News Update
 2020-03-10 03:37:49 -04:00
Novacat
fb0ebd5627 Merge pull request #6784 from Verkister/bigbois 
Some new voremob additions and tweaks
 2020-03-09 19:37:18 -04:00
Unknown
313b5c4785 Fixes compile error 2020-03-09 17:26:47 -04:00
Unknown
8c358c98e8 Mob bellytexts by Xander 2020-03-09 17:22:52 -04:00
Novacat
cff8548396 Merge pull request #6791 from VOREStation/aro-proteanruntime 
Fix two protean bugs
 2020-03-09 16:08:10 -04:00
Aronai Sieyes
f5e3ec2e62 Make protean blobs get vore prefs 2020-03-09 15:44:01 -04:00
Unknown
cf6c91db88 Moves CC to Command dept for timeclock reasons 2020-03-09 15:42:06 -04:00
Unknown
b2cd0eade0 Converts off duty system to new system 2020-03-09 15:37:45 -04:00
Aronai Sieyes
b500fbdc5d Fix a protean runtime 2020-03-09 15:35:39 -04:00
Unknown
cee18b54a6 More mrowls 2020-03-09 15:21:55 -04:00
Unknown
d23683c2f0 MROWL 2020-03-09 02:37:25 -04:00
Novacat
5be57ebb7a Update datacore.dm 2020-03-09 01:57:54 -04:00