cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 6 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

767 Commits

Author SHA1 Message Date
Nadyr
7fd1eaa5ec Merge pull request #894 from CHOMPStation2/Razgriz1032-patch-3 
Remove Loss Poster
 2020-11-22 04:11:48 -05:00
Razgriz
e56a6c7382 Remove Loss Poster 
Fixes #892
 2020-11-22 01:48:15 -07:00
Kassc
9d660c4222 Merge pull request #1 from CHOMPStation2/master 
merge master into branch
 2020-11-21 21:24:20 -05:00
cadyn
ca04b0ef72 Make the station gateway work :p 2020-11-21 13:24:49 -08:00
Novacat
a7623eacc6 Merge pull request #9310 from Jwguy/MinorAdditions 
PosterAdds
 2020-11-19 01:27:54 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Darlantan
e9abd9894d Comments out virgo staff posters 2020-09-06 03:18:26 -04:00
Atermonera
1f696fad07 Merge pull request #7585 from Mechoid/OfSnakesAndColumns 
Adds two effect types for PoIs and theoretical future bossmobs.
 2020-09-04 22:13:39 -04:00
Atermonera
3daa38aade Merge pull request #7602 from Cyantime/patch-2 
Fix jetpack ion trail
 2020-09-01 01:05:03 -04:00
Sym
0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions. 
Can't believe I didn't think of doing this already.
 2020-08-29 02:28:30 -04:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat
bac13fc41d Merge pull request #8858 from VOREStation/upstream-merge-7551 
[MIRROR] Improves Portal Documentation for New Mappers unfamiliar with DIR
 2020-08-28 13:04:56 -04:00
Novacat
5c83c09e52 Update portal.dm 2020-08-28 12:50:18 -04:00
Sym
20bcadbec6 Fixing Xenomorph lifecycle + changes 
Time to get swifty.
 2020-08-28 12:29:06 -04:00
Atermonera
57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera
96116057c0 Improves Portal Documentation for New Mappers unfamiliar with DIR 2020-08-27 19:47:56 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Rykka
c71dba5cae Converts Step_triggers to Portals! 
Implements Portal Functionality to replace the older step_triggers!

Z-level transitions are now 99.9% seamless!

It's self-explanatory, images below in editor:
![](https://i.imgur.com/EBr9mnN.png)
![](https://i.imgur.com/lP0UQxT.png)
![](https://i.imgur.com/c6VX1EC.png)
![](https://i.imgur.com/dfqDz75.png)
![](https://i.imgur.com/pUNVmBG.png)

In-game Version:
To Surface Mining:
![](https://i.imgur.com/aoJIwps.png)
![](https://i.imgur.com/nqVCYV9.png)
To Solars:
![](https://i.imgur.com/FRb6ZKB.png)
To Plains/Wilderness:
![](https://i.imgur.com/Y8kf40k.png)
 2020-08-22 20:36:49 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Rykka
ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00
izac112
582f14c138 Merge branch 'master' into izac-map 2020-08-13 21:04:41 +02:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Repede
44e41766cc VR world update 2020-08-12 21:50:42 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Cerebulon
d8f99719be disables footprint persistence (#7415) 2020-08-07 00:10:27 -04:00
Atermonera
22cec61b86 Think with Portals 2020-08-05 21:45:49 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Atermonera
2e93636b24 Merge pull request #7404 from Cerebulon/fuelbgone 
Fuel spills no longer persistent
 2020-08-02 00:23:52 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
de2c80c628 Commit 4 
Bugfixing for ChompStation errors will now happen
 2020-07-19 16:29:26 -04:00
Rykka
df7bb084f1 Bugfixes, Feature Tweaks, and Final Touches 
Microwave not cooking micros/mice: Fixed
Invalid Recipe datum thanks to /microwave prefix: Fixed
Fryer earsplittingly loud: Fixed
Fryer/Oven continuing to cook even after items removed: Fixed
Oven having 'on' icon state when door closed but off: Fixed
Appliances not scaling cooking time/damage based on size: Fixed
Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke!
Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention)
Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
 2020-07-17 23:58:33 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
SweetBlueSylveon
9e30fb2009 Removes Kisuke Poster 
Fremoves /datum/poster/vore_10
 2020-06-27 08:49:17 -07:00
SweetBlueSylveon
07867e07c7 Removes Sam Poster 
Removes /datum/poster/vore_7.
 2020-06-27 01:47:15 -07:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
863142066d Merge pull request #8118 from dwinters99/posters 
New posters
 2020-05-29 11:08:02 -04:00
dwinters99
af10438e2f Update code/game/objects/effects/decals/posters/voreposters_vr.dm 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-05-29 10:57:40 -04:00
David Winters
ec470180ba Fixed typo, capitalization 2020-05-29 03:06:43 -04:00
David Winters
d57addfdea New posters 
Following in Pip's wake, I made 11 posters. Not much more to say, really.
 2020-05-29 03:00:00 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00