cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,184 Commits 7 Branches 0 Tags
fefd3b66417b4042fca5fb7e5e46f86ade8c1de9
Commit Graph

43683 Commits

Author SHA1 Message Date
Nadyr
fefd3b6641 Merge pull request #1862 from CHOMPStationBot/upstream-merge-10217 
[MIRROR] Add LUNA's Medals
 2021-04-30 01:05:34 -04:00
Nadyr
8cd695295c Merge pull request #1861 from CHOMPStationBot/upstream-merge-10216 
[MIRROR] Add Entchtut's medal
 2021-04-30 01:04:55 -04:00
Nadyr
1930a85c2c Merge pull request #1854 from CHOMPStationBot/upstream-merge-10208 
[MIRROR] Makes Protean blobform less robust
 2021-04-30 00:54:38 -04:00
Nadyr
1b2f02bc02 Merge pull request #1859 from Holdelta/master 
Adding back Teshari Radiation Suits from YawnWider
 2021-04-30 00:50:10 -04:00
Nadyr
96e5d0b44c Merge pull request #1852 from CHOMPStationBot/upstream-merge-10205 
[MIRROR] [MIRROR] Fix for the Teshari Exploration and pilot Voidsuit
 2021-04-30 00:48:20 -04:00
Nadyr
0be4fe8fd2 Merge pull request #1851 from CHOMPStationBot/upstream-merge-10206 
[MIRROR] [MIRROR] Makes xenowear species WL check for species instead of ckey
 2021-04-30 00:42:42 -04:00
Nadyr
cb415c440c Merge pull request #1850 from CHOMPStationBot/upstream-merge-10202 
[MIRROR] Fixes voremob icon updates messing with scaling
 2021-04-30 00:41:13 -04:00
Nadyr
b600895a52 Merge pull request #1849 from CHOMPStationBot/upstream-merge-10201 
[MIRROR] [MIRROR] Drink Overhaul V1.2
 2021-04-30 00:40:42 -04:00
Novacat
f6d79c391d Merge pull request #10217 from ResidentCody/Personal-Fork 
Add LUNA's Medals
 2021-04-27 04:19:22 +00:00
Novacat
3f10cf6eb5 Merge pull request #10216 from Little-119/medal-addition 
Add Entchtut's medal
 2021-04-27 03:02:02 +00:00
Test Turtle
3710454701 Adding back Teshari Radiation suits from YW 2021-04-26 14:02:40 -07:00
Novacat
ba3c3e7031 Merge pull request #10208 from Novacat/nova-basicfixes 
Makes Protean blobform less robust
 2021-04-26 15:02:57 +00:00
Novacat
fbd438d3e8 Merge pull request #10205 from VOREStation/upstream-merge-8049 
[MIRROR] Fix for the Teshari Exploration and pilot Voidsuit
 2021-04-25 23:01:26 +00:00
Novacat
bf5262dd55 Merge pull request #10206 from VOREStation/upstream-merge-8047 
[MIRROR] Makes xenowear species WL check for species instead of ckey
 2021-04-25 23:00:19 +00:00
Novacat
4f56cc5b9d Merge pull request #10202 from Verkister/patch-48 
Fixes voremob icon updates messing with scaling
 2021-04-25 04:41:11 +00:00
Novacat
4445ec6a60 Merge pull request #10201 from VOREStation/upstream-merge-8041 
[MIRROR] Drink Overhaul V1.2
 2021-04-25 04:33:58 +00:00
Chompstation Bot
f8055f9674 [MIRROR] Updates all bots to use TGUI, and adds mute button for certain bots 2021-04-23 04:30:04 -04:00
Chompstation Bot
74dd9fc236 [MIRROR] ABS shows appendicitis 2021-04-23 03:39:40 -04:00
Nadyr
bf2caae1b1 Merge pull request #1819 from CHOMPStationBot/upstream-merge-10165 
[MIRROR] TGUI Fix Compilation
 2021-04-23 03:34:53 -04:00
Razgriz
e4764419cd Merge pull request #1836 from CHOMPStationBot/upstream-merge-10185 
[MIRROR] [MIRROR] Practice/Lasertag weapons no longer excavate
 2021-04-22 20:22:09 -07:00
Razgriz
13cbde46cd Merge pull request #1839 from CHOMPStationBot/upstream-merge-10186 
[MIRROR] [MIRROR] Lying on the ground can be left or right
 2021-04-21 21:57:37 -07:00
Razgriz
a44c55d3ae Merge pull request #1838 from CHOMPStationBot/upstream-merge-10187 
[MIRROR] [MIRROR] Changed size check to type check for platform recharger denial check.
 2021-04-21 21:57:25 -07:00
Razgriz
241c6447c8 Update beams.dm 2021-04-21 21:48:30 -07:00
Razgriz
0a912847fc Merge pull request #1834 from CHOMPStationBot/upstream-merge-10183 
[MIRROR] [MIRROR] Random spawner refactor.
 2021-04-21 21:45:26 -07:00
Razgriz
97140d5311 Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175 
[MIRROR] Changes blueprints to use ChangeArea
 2021-04-21 21:45:13 -07:00
Razgriz
2f5918395c Merge pull request #1828 from CHOMPStationBot/upstream-merge-10114 
[MIRROR] Captain's Rapier
 2021-04-21 21:43:15 -07:00
Razgriz
d21c160d33 Merge pull request #1820 from CHOMPStationBot/upstream-merge-10067 
[MIRROR] Don't tell the whole world who was playing silicons
 2021-04-21 21:32:28 -07:00
Razgriz
33090cc00a Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157 
[MIRROR] Adminbus Update
 2021-04-21 21:24:09 -07:00
Razgriz
139055cd5d Update ticker.dm 2021-04-21 21:20:39 -07:00
Novacat
40535241c9 Merge pull request #10186 from VOREStation/upstream-merge-8038 
[MIRROR] Lying on the ground can be left or right
 2021-04-21 06:48:13 +00:00
Novacat
828280f7c1 Merge pull request #10187 from VOREStation/upstream-merge-8039 
[MIRROR] Changed size check to type check for platform recharger denial check.
 2021-04-21 06:32:53 +00:00
Chompstation Bot
147887545f [MIRROR] Practice/Lasertag weapons no longer excavate 2021-04-21 06:31:39 +00:00
Novacat
0e2ecee8a7 Merge pull request #10183 from VOREStation/upstream-merge-8034 
[MIRROR] Random spawner refactor.
 2021-04-21 06:30:26 +00:00
Novacat
d25749a8b3 Merge pull request #10175 from Novacat/nova-ert 
Changes blueprints to use ChangeArea
 2021-04-20 22:41:11 +00:00
Chompstation Bot
2856028342 Captain's Rapier 2021-04-20 16:50:56 +00:00
Chompstation Bot
40a6ee514c Don't tell the whole world who was playing silicons 2021-04-19 19:24:20 +00:00
Chompstation Bot
1bc56b471f TGUI Fix Compilation 2021-04-19 18:13:08 +00:00
Nadyr
d15ddded40 fix icon via inheritence 2021-04-18 03:30:52 -04:00
Chompstation Bot
d21a54ad80 Adminbus Update 2021-04-15 23:56:20 +00:00
Shadowfire
71daa80a80 Implants and Mechs from a dispenser? Oh my! 
Added prizes to casino, and also small rework for streamlining of ckey work. Poor Kassc has to spend hours adding hundreds of items for you guys to enjoy after these casino events!
 2021-04-15 01:14:06 +02:00
Razgriz
4480240805 Merge pull request #1804 from CHOMPStationBot/upstream-merge-10143 
[MIRROR] Tiny species fix 2, electric boogaloo
 2021-04-13 20:31:02 -07:00
Razgriz
1f05b0e1cf Merge pull request #1807 from ZVB334/BorerTweak 
Hides Borers from Health HUDs
 2021-04-13 20:30:43 -07:00
Razgriz
d8537574c0 Merge pull request #1809 from Darlantanis/RacoonsAndImplants 
Backup Implanter, Raccoons
 2021-04-13 20:30:28 -07:00
Razgriz
54da2e9f6a Merge pull request #1812 from CHOMPStationBot/upstream-merge-10153 
[MIRROR] Fixes Xenochimera Custom Traits
 2021-04-13 12:05:59 -07:00
Novacat
2ec3f25ba9 Merge pull request #10153 from Novacat/nova-ert 
Fixes Xenochimera Custom Traits
 2021-04-13 18:17:32 +00:00
Novacat
373dd4ff8e Merge pull request #10150 from Nyksia/final-species-fix 
Final species fix (don't jinx it)
 2021-04-13 12:22:34 +00:00
Darlantan
6806e7d9b5 Implanter, raccoons 2021-04-13 04:31:10 -04:00
Nadyr
efc8399a3b Merge pull request #1808 from CHOMPStationBot/upstream-merge-10149 
[MIRROR] Replaces old pilot helmets
 2021-04-13 00:42:19 -04:00
Novacat
93b480e5fb Merge pull request #10149 from Novacat/nova-ert 
Replaces old pilot helmets
 2021-04-13 02:39:37 +00:00
ZVB334
ea5ed6f1fa Update life.dm 2021-04-12 15:39:32 -05:00