cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 22:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,362 Commits 8 Branches 0 Tags
f49e08b8ebdc458a646cbb98201224a4bb98fd86
Commit Graph

792 Commits

Author SHA1 Message Date
Nadyr
06337b17d6 Merge pull request #2222 from CHOMPStationBot/upstream-merge-10641 
[MIRROR] [MIRROR] Adds a graffiti spawner for PoI and general map-making.
 2021-06-19 21:39:18 -04:00
Chompstation Bot
68b6d08b6d [MIRROR] Adds a graffiti spawner for PoI and general map-making. 2021-06-18 04:44:47 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Aronai Sieyes
0028ef1ef0 Merge pull request #10568 from VOREStation/upstream-merge-8111 
[MIRROR] Add Secret ZLevels
 2021-06-07 05:33:52 +00:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
04b2b0af70 Add secret zlevels 2021-05-26 01:44:00 +00:00
Aronai Sieyes
b2217f0b18 Merge pull request #10323 from VOREStation/Arokha/beamqdel 
Help beam_components qdel properly
 2021-05-13 15:49:53 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Sym
8ca11f0439 Changing player Xenomorphs to Genaprawns 2021-03-26 19:42:08 -04:00
Cadyn
6b49476cc1 Portal tweaks 2021-03-04 01:13:34 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Sym
f718e0915e Fix xenomorph egg notification & remove glob var I added 
Removes a global var that wasn't used that I added in a fit to stupidity, and fixes the snowflake ghost_pod code for xenomorph eggs.
 2021-02-18 06:04:09 -05:00
Novacat
8111e7bd10 Merge pull request #9735 from Novacat/nova-basicfixes 
Additional GC Fixes
 2021-02-16 19:48:00 +00:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
cadyn
3bc058624e Merge branch 'master' into Precursorpewpew 2021-02-04 20:49:25 -08:00
Sym
2d641fed65 Adds Precursor Projectile for alien guns 
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
 2021-02-04 23:15:51 -05:00
cadyn
c86326e7a5 Fix stuff and give name 2021-01-29 21:46:00 -08:00
cadyn
bcfdb424c2 Adding telecrystal stuff for event 2021-01-29 15:13:52 -08:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Shadowfire
b2dfb35c54 So this is Christmas... 
Made fake presents for decoration purposes
Made fake snowfall effect for mood
Made advanced presents that have randomized size and shape, will have a bigger selection of possible gifts in update along with a rare chaos version that will have it's own smaller but much powerful items!
Made new id sprites and access cards for casino medical/security/engineering
Took the old girl out back and put her down, sorry Casino Ferry, you served us all well!

And a big big rework and remapping of casino and disabled it from round start to ease up on processing, sorry kids. No snooping the goods from now on!
 2020-12-15 01:43:30 +01:00
Cadyn
e1d970908f Appease travis' replacement 2020-11-30 16:39:12 -08:00
Cadyn
9521b59193 Kassc portals :) 2020-11-30 16:24:46 -08:00
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