cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +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
78e6fa891a Merge pull request #6833 from Novacat/nova-pathfinder 
Rigsuit Slot Updates
 2020-03-12 13:26:45 -04:00
Unknown
e8282b6232 Rigsuit Slot Updates 
- Adds Defibrilator compatibility to RIGsuits
- Allows the compact RIGsuit's suit storage to be compatible with belts and compact defibrilators
 2020-03-12 12:30:09 -04:00
Heroman
a7a9080362 Separates PTO being earned into its own var 2020-03-12 11:47:55 +10:00
Novacat
9b54f851b7 Merge pull request #6819 from VOREStation/upstream-merge-6810 
[MIRROR] QoL: Hacking
 2020-03-11 21:26:36 -04:00
Novacat
fd8c620703 Merge pull request #6817 from VOREStation/upstream-merge-6802 
[MIRROR] Adds more machine button sounds
 2020-03-11 21:25:40 -04:00
Neerti
22954a5a04 QoL: Hacking (#6810) 
* Makes hacking window consider all hands instead of just the active one.

* Makes bottom indicators in hacking window go bold if they changed since the last refresh.

* Changelog
 2020-03-11 20:36:42 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Cerebulon
279cd2dc73 PDA Boops when you button (#6801) 2020-03-11 20:30:51 -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
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
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
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
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
0e2346ce8c Make transit look nicer with transit dust 2020-03-11 11:11:43 -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
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1 
Cooking adjustments
 2020-03-10 18:41:02 -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
Atermonera
942cc04433 Merge pull request #6800 from Cerebulon/spiderstomp 
Allows Spiderlings to be Stomped
 2020-03-10 03:46:29 -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
Unknown
cee18b54a6 More mrowls 2020-03-09 15:21:55 -04:00
Unknown
d23683c2f0 MROWL 2020-03-09 02:37:25 -04:00
Novacat
ec12b68c25 Update jobs.dm 2020-03-09 01:49:00 -04:00
Novacat
0fe1097efc Update card.dm 2020-03-09 01:48:06 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Novacat
70ce4a2797 Update world.dm 2020-03-09 01:31:07 -04:00
Atermonera
51d74bc25b Merge pull request #6793 from Cerebulon/emlocksprite 
Fixes shuttle emergency locker sprites
 2020-03-08 16:22:34 -04:00
Novacat
6eb9b4faf6 Merge pull request #6780 from VOREStation/upstream-merge-6767 
[MIRROR] Exosuit Expansion: Return of the Ripley
 2020-03-08 12:31:50 -04:00
Novacat
3c06d62345 Update weldingtool.dm 2020-03-08 03:25:18 -04:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Aronai Sieyes
72f239b2ac Makes pregame time a config setting 
Boo hardcoded values
 2020-03-08 01:05:28 -04:00
Aronai Sieyes
632d3a8dc5 Merge pull request #6773 from VOREStation/aro-blufo 
Random stuff for map use/events
 2020-03-06 13:14:37 -05:00
Arokha Sieyes
3f782d1ea2 Sprites 'n stuff 2020-03-06 13:03:53 -05:00
Aronai Sieyes
7e848e90fc Merge pull request #6772 from VOREStation/aro-blufo 
Various minor things
 2020-03-06 09:58:00 -05:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
Aronai Sieyes
c9f7465ee2 Touch up bed/chair/stool icon updating 2020-03-05 23:30:07 -05:00
Aronai Sieyes
4b5069582b Sprites for alien and frontier translocators 2020-03-05 23:30:07 -05:00
Aronai Sieyes
4bfbb99356 Brighter permanent light 2020-03-05 23:20:58 -05:00