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
60,468 Commits 5 Branches 0 Tags
49ef2d2ee9c7f0018bfbf53d2fe2382de7cdf6e4
Commit Graph

18155 Commits

Author SHA1 Message Date
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Razgriz
b43ae1a006 Merge pull request #767 from CHOMPStationBot/upstream-merge-9259 
[MIRROR] Enables OOC during votes
 2020-10-28 04:59:21 -07:00
Nadyr
766204a4f4 Merge pull request #717 from CHOMPStationBot/upstream-merge-9229 
[MIRROR] [MIRROR] adds VR thunderdome to CentComm area
 2020-10-28 05:57:36 -04:00
Nadyr
3b8655f2e4 Merge pull request #768 from CHOMPStationBot/upstream-merge-9257 
[MIRROR] This is *not* what _onclick is for FFS
 2020-10-28 05:01:59 -04:00
Verkister
420b44c449 Merge pull request #9257 from ShadowLarkens/paifix 
This is *not* what _onclick is for FFS
 2020-10-28 07:11:48 +00:00
Verkister
712a1a5860 Merge pull request #9259 from Cyantime/patch-3 
Enables OOC during votes
 2020-10-28 07:11:41 +00:00
Razgriz
1c382db57d Merge pull request #751 from MisterGrimm/TheseAreMicroStuff 
Changes names and descriptions of micro mech equipment
 2020-10-27 02:19:16 -07:00
Razgriz
545b1a8486 Merge pull request #761 from CHOMPStationBot/upstream-merge-9253 
[MIRROR] [MIRROR] Adds new balloons
 2020-10-27 02:15:44 -07:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Verkister
b7f4c2192c Merge pull request #9253 from VOREStation/upstream-merge-7748 
[MIRROR] Adds new balloons
 2020-10-27 08:17:38 +00:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
Sym
49d70a6f42 Makes micro equipment more obvious 
Because this is desperately needed.
 2020-10-24 10:49:31 -04:00
Razgriz
d1d2e5905c Merge pull request #744 from cadyn/husksurgery 
Adding dehusk and tox/oxyloss surgery
 2020-10-23 19:57:51 -07:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
Nadyr
c24e9101c8 Merge pull request #733 from CHOMPStationBot/upstream-merge-9217 
[MIRROR] Creates proper names and descriptions for sprites found in amayastuff.dmi.
 2020-10-22 10:16:33 -04:00
Nadyr
a9bdc52b09 Merge pull request #719 from CHOMPStationBot/upstream-merge-9227 
[MIRROR] [MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
 2020-10-22 09:35:07 -04:00
Cadyn
732025c8ce Adding dehusk and tox/oxyloss surgery 2020-10-21 23:32:27 -07:00
Razgriz
dbe871bd9b Merge pull request #704 from CHOMPStationBot/upstream-merge-9235 
[MIRROR] [MIRROR] Fix most borosilicate shards disappearing instantly after being made
 2020-10-19 18:10:20 -07:00
Razgriz
68b0a1bd15 Merge pull request #702 from CHOMPStationBot/upstream-merge-9242 
[MIRROR] [MIRROR] Wall Cabinets & Crate Markings
 2020-10-19 18:07:44 -07:00
Verkister
2bb6e0504e Merge pull request #9217 from AmayaWah/flora-again 
Creates proper names and descriptions for sprites found in amayastuff.dmi.
 2020-10-19 10:41:00 +00:00
Verkister
7d408e9996 Merge pull request #9227 from VOREStation/upstream-merge-7714 
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
 2020-10-19 10:39:13 +00:00
Chompstation Bot
4471b8c23a [MIRROR] adds VR thunderdome to CentComm area 2020-10-19 10:38:58 +00:00
Verkister
16a23eadec Merge pull request #9235 from VOREStation/upstream-merge-7726 
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
 2020-10-19 10:37:24 +00:00
Verkister
d7298336a8 Merge pull request #9242 from VOREStation/upstream-merge-7724 
[MIRROR] Wall Cabinets & Crate Markings
 2020-10-19 10:37:04 +00:00
Chompstation Bot
77c15811a2 Datum Component System (/tg/ port) 2020-10-19 10:36:26 +00:00
LunarFleet
bd1503a35d Realized I could touch up the interactions a bit 2020-10-15 23:37:26 -04:00
LunarFleet
163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
Razgriz
b9e3c72caa Merge pull request #582 from cadyn/tguifix 
TGUI fix
 2020-10-14 18:39:00 -07:00
Cadyn
3019393860 TGUI fix 2020-10-14 06:57:47 -07:00
Cadyn
0935ab854e Travis is mean 2020-10-13 14:33:47 -07:00
Cadyn
dcc1c41b2b Resleeving fix 2020-10-13 13:44:32 -07:00
KasparoVy
12dac5c191 Fixes Only One Accessory Equipped at Spawn & in Character Preview 
Ported from Aurora PR#10205, credit to fernerr
EARLYPORT OF POLARIS & VIRGO PRS

Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.

Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
 2020-10-08 18:38:37 -04:00
Razgriz
04a31152dd Reversion 2020-10-06 23:49:46 -07:00
Razgriz
0a8521f900 Merge pull request #568 from cadyn/vspull 
Direct pull from virgo
 2020-10-06 20:52:54 -07:00
Razgriz
c5d77c92cd Update offduty_vr.dm 2020-10-06 16:21:05 -07:00
Razgriz
f932863bb2 Merge pull request #570 from MisterGrimm/Moronfixing 
Fixing the work of a moron.
 2020-10-06 17:16:35 -06:00
Razgriz
ef5f28cb0c Merge pull request #551 from Holdelta/master 
Reverting changes to the RMS
 2020-10-06 15:40:56 -06:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Sym
025397c417 Fixing the work of a moron. 
Just.. Im just frothing with rage while looking at some of this stuff. Some polaris dude named Neerti did a bunch of half assed commenting five years ago, and has been causing a shit ton of warning messages because of it. I ended up fixing most of it out of pure rage.

Tell me if you guys need a CHOMPedit on these, because this is mostly just fixing really stupid commented out stuff that should have been fixed years ago by the person that did this. I wouldn't think it would need a CHOMPedit, but you never know.
 2020-10-05 17:55:48 -04:00
Razgriz
88f0d501db Fix doors again 2020-10-05 01:34:39 -07:00
Razgriz
25dc162dbe Fix door default sounds 2020-10-04 22:30:50 -07:00
Amaya
6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Runa Dacino
61e6324dbf Lowered from 6 to 5. I skimmed over pilot, and saw a six. 2020-09-30 21:08:57 +02:00
Runa Dacino
a65a448c07 Increases off-duty pay to match department lowest. 2020-09-30 20:58:58 +02:00
Runa Dacino
890ad97655 Gives off-duty explorers payraise. 2020-09-30 20:58:09 +02:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00