cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,161 Commits 6 Branches 0 Tags
3d86b718451b49eabc712d049b612b9f167d3f67
Commit Graph

41755 Commits

Author SHA1 Message Date
Cadyn
3d86b71845 Travis why 2020-10-05 21:02:10 -07:00
Cadyn
f0cddb7b1e One more bugfixy 2020-10-05 20:00:43 -07: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
Razgriz
136e589b15 Reorganize toggle verbs 
Because having these being worlds apart makes it easy for them to get lost.
 2020-10-05 01:44:39 -07:00
Razgriz
88f0d501db Fix doors again 2020-10-05 01:34:39 -07:00
Razgriz
879e7156e8 Chomp-specific 2020-10-04 23:58:23 -07:00
Novacat
c85dc46586 Merge pull request #9154 from Zandario/year-old-issue 
Fixed a minor issue that's kinda been overlooked for a while
 2020-10-05 02:12:42 -04:00
Razgriz
25dc162dbe Fix door default sounds 2020-10-04 22:30:50 -07:00
Razgriz
64ed8a42c1 Swap default door sounds 2020-10-04 22:16:20 -07:00
Novacat
1332075622 Merge pull request #9156 from VOREStation/Verkister-patch-1 
Couple taur fixes.
 2020-10-04 13:18:07 -04:00
Heroman
7d1828f2b4 Fixes = typo 2020-10-04 19:50:30 +10:00
Heroman
bd8e240211 Standartizes gear_tweaks on _vr only items 2020-10-04 19:47:42 +10:00
ShadowLarkens
31c1375b68 Fix RIG crashes & Chem Injector 2020-10-02 22:33:30 -07:00
ShadowLarkens
37b1850bae Readd ability to silence touch sounds 2020-10-02 22:06:32 -07:00
ShadowLarkens
83da5313f6 Fix PDA access to use regular tgui inventory rules 2020-10-02 21:56:57 -07:00
Atermonera
c421782aa2 Mobs don't get lost in space (#7713) 2020-10-02 21:24:00 -04:00
Verkister
b1dd9b0531 Update sprite_accessories_taur_vr.dm 2020-10-02 17:57:15 +03:00
Verkister
a00e979e17 haha me funney 2020-10-02 17:56:42 +03:00
Verkister
fa176c3b5c Couple taur fixes. 
Fixes skunk being a wolf subtype and thus going for the wolf fitted taursuits (oops)
Also fixes the taur riding mechanics not allowing non-ridable "taur tails" (aka tails just using the subtype for wider sprites without actually being taurs) to ride.
 2020-10-02 17:50:08 +03:00
Zandario
91c132a6e2 Actually logistics Hivebots were commented as Commander Hivebots too 2020-10-01 21:13:54 -05:00
Zandario
8f86c8742c No idea how much y'all use these but that's kinda a smol OOF 2020-10-01 21:00:47 -05:00
Amaya
6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Nadyr
595562e044 Merge pull request #560 from MisterGrimm/master 
Changing Sickshot desc and info_desc
 2020-10-01 00:01:47 -04:00
Novacat
06e9971d0b Merge pull request #9141 from dwinters99/wolftaur 
Fixes #9099
 2020-09-30 16:05:36 -04: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
Riley
ec42a286d0 Clara's Vacuum Flask 
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
 2020-09-29 18:01:07 -04:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
David Winters
93f9e1908d fixes #9099 2020-09-29 04:28:40 -04:00
Novacat
f25d6729a7 Merge pull request #9136 from dwinters99/explo-shieldbash 
Explo shields shieldbash
 2020-09-29 02:53:49 -04:00
David Winters
42bb682240 Fixes #8592 2020-09-29 01:18:06 -04:00
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
Novacat
1e396dbf98 Merge pull request #9107 from KillianKirilenko/kk-grubs 
Oregrubs
 2020-09-28 03:30:44 -04:00
Novacat
f7872acb63 Merge pull request #9130 from Screemonster/treebreathers 
Fix alraune suit detection
 2020-09-27 20:01:50 -04:00
DESKTOP-4BUBN9N\Mike
9ff12d4e80 Fix alraune suit detection 2020-09-28 00:24:42 +01:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Nadyr
a615e822a2 updates scarab and phoron bore 2020-09-27 18:38:06 -04:00
Novacat
bd2b0cefbf Merge pull request #8994 from KillianKirilenko/kk-adminships 
ERT & Mercenary Ship Remodels
 2020-09-27 17:21:14 -04:00
Novacat
386f23e8e7 Merge pull request #9126 from Heroman3003/delicious-hat 
Adds Charles' Tophat
 2020-09-27 17:04:38 -04:00
Novacat
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04:00
Novacat
7561a5cfd6 Merge pull request #8926 from KillianKirilenko/kk-ships 
Additional Ships
 2020-09-27 17:01:12 -04:00
Heroman
c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Razgriz
5ac661db1e Update configuration.dm 2020-09-26 22:58:13 -06:00
Razgriz
0196137d1b Update for persistence 2020-09-26 22:57:29 -06:00
Novacat
65c677ba30 Merge pull request #9088 from ShadowLarkens/shadow_fluff 
Add Shadow Larkens laptop fluff item
 2020-09-26 21:16:21 -04:00
Razgriz
4ad2efbc81 Update negative.dm 2020-09-26 17:05:37 -07:00
Razgriz
69588d8764 Remove duplicate code block 2020-09-26 15:24:06 -07:00
Razgriz
8cc3e87f1b Update scannable fabricator pathname 2020-09-26 15:13:00 -07:00