cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,936 Commits 6 Branches 0 Tags
7372e6cd148214f94e35255b6800436cf6fe803c
Commit Graph

62936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
9f1132898d Update vorestation.dme 2021-04-03 02:53:54 -04:00
Chompstation Bot
413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00
Nadyr
3a0522179d Merge pull request #190 from CHOMPStation2/master 
update master
 2021-04-03 02:15:32 -04:00
Nadyr
eaf59daa4a Merge pull request #1686 from CHOMPStationBot/upstream-merge-10028 
[MIRROR] Makes the event HUD work
 2021-04-03 01:55:52 -04:00
Nadyr
c758aba8dd Merge pull request #1714 from CHOMPStationBot/upstream-merge-10055 
[MIRROR] [MIRROR] Tesh gliding tweaks.
 2021-04-03 01:20:41 -04:00
Nadyr
e25155514c Merge branch 'master' into upstream-merge-10028 2021-04-03 01:20:13 -04:00
Nadyr
92810c6698 Update movement.dm 2021-04-03 01:11:45 -04:00
Nadyr
c6bb60d172 Update living.dm 2021-04-03 01:09:45 -04:00
Nadyr
e7d1cc2259 Update teshari.dm 2021-04-03 01:06:06 -04:00
Nadyr
396255427f Update teshari.dm 2021-04-03 01:05:19 -04:00
Nadyr
9ccbd2fa6d Update species.dm 2021-04-03 01:01:13 -04:00
Nadyr
514a61ecde Update human.dm 2021-04-03 00:59:43 -04:00
Nadyr
4cbf330a93 Merge branch 'master' into upstream-merge-10055 2021-04-03 00:25:44 -04:00
Nadyr
a364bb759d Merge pull request #1735 from CHOMPStationBot/upstream-merge-10072 
[MIRROR] [MIRROR] Prevented Teshari from selecting positronic brains.
 2021-04-03 00:03:37 -04:00
Nadyr
5cfe385f39 Update teshari.dm 2021-04-02 23:46:13 -04:00
Nadyr
4ea1252f09 Merge pull request #1736 from CHOMPStationBot/upstream-merge-10074 
[MIRROR] Adds a verb for printing out vorebelly settings into chat for copypasting
 2021-04-02 23:37:00 -04:00
Nadyr
1d0086de0c Merge pull request #1717 from CHOMPStationBot/upstream-merge-10058 
[MIRROR] [MIRROR] Updates respawn_character some more
 2021-04-02 23:31:45 -04:00
Nadyr
1c6390c1e3 Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046 
[MIRROR] [MIRROR] Tanning Tweaks
 2021-04-02 23:29:50 -04:00
Nadyr
eb3bbb3502 github stop 2021-04-02 23:14:03 -04:00
Nadyr
8676606747 Update update_icons.dm 2021-04-02 23:11:41 -04:00
Nadyr
1998e90f55 Update update_icons.dm 2021-04-02 23:05:23 -04:00
Nadyr
b3da731692 Update teshari.dm 2021-04-02 23:00:03 -04:00
Nadyr
2d28682a36 Update material_recipes.dm 2021-04-02 22:53:31 -04:00
Darlantanis
6e08afe79c Automatic changelog generation for 2021-04-03 02:24:09 +00:00
Nadyr
5bd5dc4cbf Merge pull request #1713 from CHOMPStationBot/upstream-merge-10056 
[MIRROR] [MIRROR] Minor ID sprite tweaks
 2021-04-02 22:23:16 -04:00
Chompstation Bot
c9ff466327 Adds a verb for printing out vorebelly settings into chat for copypasting 2021-04-02 17:59:52 +00:00
Novacat
d31519daba Merge pull request #10074 from Verkister/spambutt 
Adds a verb for printing out vorebelly settings into chat for copypasting
 2021-04-02 17:59:52 +00:00
Chompstation Bot
9029dfd48d [MIRROR] Prevented Teshari from selecting positronic brains. 2021-04-02 17:58:45 +00:00
Razgriz
8dbfa54ee6 Merge pull request #1734 from CHOMPStation2/Razgriz1032-patch-18 
Map fix?
 2021-04-02 05:34:45 -07:00
Razgriz
8e3ce45e00 Add files via upload 2021-04-02 05:25:38 -07:00
Razgriz
dd2043fdc7 Merge pull request #1733 from CHOMPStation2/revert-1721-Razgriz1032-patch-12 
Revert "Volume tweak"
 2021-04-02 05:11:32 -07:00
Razgriz
f184d34b52 Revert "Volume tweak" 2021-04-02 03:44:19 -07:00
Razgriz
6c53c17663 Merge pull request #1732 from CHOMPStation2/Razgriz1032-patch-15 
Prevent proteans from eating metals they can't process anymore
 2021-04-02 02:48:22 -07:00
Razgriz
47597f90c4 Update protean_powers.dm 2021-04-02 02:29:52 -07:00
Razgriz
1362cd2ea1 HOPEFULLY nerf protean metal eating this time 2021-04-02 02:28:19 -07:00
Razgriz
f1226d94f0 Merge pull request #1731 from CHOMPStation2/Razgriz1032-patch-14 
Shutting down onlyfans
 2021-04-02 00:41:27 -07:00
Razgriz
c2c1b23f06 Shutting down onlyfans 
RIP April 1st.
 2021-04-01 20:42:26 -07:00
Razgriz
e6f53c4ea0 Merge pull request #1723 from CHOMPStation2/dependabot/npm_and_yarn/tgui/y18n-4.0.1 
Bump y18n from 4.0.0 to 4.0.1 in /tgui
 2021-04-01 04:14:42 -07:00
Razgriz
6df64c0f02 Merge pull request #1727 from CHOMPStationBot/upstream-merge-10069 
[MIRROR] Makes eternal bonfires a bit less hot
 2021-04-01 04:14:11 -07:00
Chompstation Bot
934501bdc2 Makes eternal bonfires a bit less hot 2021-04-01 10:41:57 +00:00
Razgriz
5dc30fef56 Merge pull request #1725 from CHOMPStation2/MiyoUpdate 
minor map update
 2021-04-01 00:32:42 -07:00
Razgriz
52fe056ff8 Merge pull request #1724 from CHOMPStation2/Razgriz1032-patch-13 
egg
 2021-04-01 00:32:35 -07:00
Duriel Levara
5419e9517c minor map update 
Added more security fans
 2021-04-01 03:21:47 -04:00
Razgriz
156df2c64d egg 2021-04-01 00:20:57 -07:00
dependabot[bot]
77b870540c Bump y18n from 4.0.0 to 4.0.1 in /tgui 
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-01 06:38:46 +00:00
Razgriz
1ea7afee25 Merge pull request #1721 from CHOMPStation2/Razgriz1032-patch-12 
Volume tweak
 2021-03-31 18:00:08 -07:00
Razgriz
b0d21eb9e8 Volume tweak 2021-03-31 17:50:11 -07:00
Razgriz
4ab70bc747 Merge pull request #1720 from CHOMPStation2/MayorUpdate 
Mayor map update
 2021-03-31 17:49:18 -07:00
Duriel Levara
ca23ddc270 Mayor map update 
-Overhaul station upgrade.
-New exploration department on the first floor.
-Remodeled xenobio and xenoflora.
-Remodeled Toxins.
-Remodeled third floor doorms.
-And a number of tweaks across the whole station.
 2021-03-31 17:24:36 -04:00
Razgriz
d6a3cfb1de Merge pull request #1715 from CHOMPStationBot/upstream-merge-10054 
[MIRROR] [MIRROR] Non-mobs aren't allies
 2021-03-31 04:32:29 -07:00