cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-18 10:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,151 Commits 11 Branches 0 Tags
08534fd4a7fa2b60e616489a6b5c186f83facbb3
Commit Graph
43667 Commits
Author SHA1 Message Date
Chompstation Bot 08534fd4a7 Minor Fixes 2021-05-01 01:22:56 +00:00
Chompstation BotandDarlantan 74dd9fc236 [MIRROR] ABS shows appendicitis 2021-04-23 03:39:40 -04:00
NadyrandGitHub bf2caae1b1 Merge pull request #1819 from CHOMPStationBot/upstream-merge-10165 
[MIRROR] TGUI Fix Compilation
 2021-04-23 03:34:53 -04:00
RazgrizandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 241c6447c8 Update beams.dm 2021-04-21 21:48:30 -07:00
RazgrizandGitHub 0a912847fc Merge pull request #1834 from CHOMPStationBot/upstream-merge-10183 
[MIRROR] [MIRROR] Random spawner refactor.
 2021-04-21 21:45:26 -07:00
RazgrizandGitHub 97140d5311 Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175 
[MIRROR] Changes blueprints to use ChangeArea
 2021-04-21 21:45:13 -07:00
RazgrizandGitHub 2f5918395c Merge pull request #1828 from CHOMPStationBot/upstream-merge-10114 
[MIRROR] Captain's Rapier
 2021-04-21 21:43:15 -07:00
RazgrizandGitHub 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
RazgrizandGitHub 33090cc00a Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157 
[MIRROR] Adminbus Update
 2021-04-21 21:24:09 -07:00
RazgrizandGitHub 139055cd5d Update ticker.dm 2021-04-21 21:20:39 -07:00
NovacatandChompstation Bot 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
NovacatandChompstation Bot 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
NovacatandChompstation Bot 0e2ecee8a7 Merge pull request #10183 from VOREStation/upstream-merge-8034 
[MIRROR] Random spawner refactor.
 2021-04-21 06:30:26 +00:00
NovacatandChompstation Bot 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
NadyrandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 1f05b0e1cf Merge pull request #1807 from ZVB334/BorerTweak 
Hides Borers from Health HUDs
 2021-04-13 20:30:43 -07:00
RazgrizandGitHub d8537574c0 Merge pull request #1809 from Darlantanis/RacoonsAndImplants 
Backup Implanter, Raccoons
 2021-04-13 20:30:28 -07:00
RazgrizandGitHub 54da2e9f6a Merge pull request #1812 from CHOMPStationBot/upstream-merge-10153 
[MIRROR] Fixes Xenochimera Custom Traits
 2021-04-13 12:05:59 -07:00
NovacatandChompstation Bot 2ec3f25ba9 Merge pull request #10153 from Novacat/nova-ert 
Fixes Xenochimera Custom Traits
 2021-04-13 18:17:32 +00:00
NovacatandChompstation Bot 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
NadyrandGitHub efc8399a3b Merge pull request #1808 from CHOMPStationBot/upstream-merge-10149 
[MIRROR] Replaces old pilot helmets
 2021-04-13 00:42:19 -04:00
NovacatandChompstation Bot 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
RazgrizandGitHub d89fa37b18 Update species_vr.dm 2021-04-12 12:19:28 -07:00
RazgrizandGitHub 08fd929805 Merge branch 'master' into upstream-merge-10143 2021-04-12 12:17:42 -07:00
RazgrizandGitHub dcc9332d84 Update blank_vr.dm 2021-04-12 12:13:32 -07:00
Chompstation Bot 36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Chompstation Bot 0b788ef40d Tiny species fix 2, electric boogaloo 2021-04-12 12:31:48 +00:00
RazgrizandGitHub 43df25a5e5 Removed some duplicates 
Removed some teas as they were already in https://github.com/CHOMPStation2/CHOMPStation2/blob/master/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2021-04-12 02:32:50 -07:00
VerkisterandGitHub 528aa98d95 Earlyports traits fix 
ascian went to sleep
 2021-04-12 11:10:35 +03:00
RazgrizandGitHub 210620be2b Points 2021-04-11 23:55:27 -07:00
RazgrizandGitHub 72ad3bf1fb spelling 2021-04-11 23:44:06 -07:00
NadyrandGitHub e0c61bacf5 Merge pull request #1795 from CHOMPStationBot/upstream-merge-10129 
[MIRROR] Miscellaneous Sundries
 2021-04-11 23:11:43 -04:00
NadyrandGitHub 341f981d20 Merge pull request #1800 from CHOMPStationBot/upstream-merge-10136 
[MIRROR] Extra hot species fix or how not to forget things
 2021-04-11 23:00:57 -04:00
NadyrandGitHub d6cfcea267 Merge pull request #1245 from CHOMPStationBot/upstream-merge-9650 
[MIRROR] [MIRROR] Event Managers can use TGUI interactions
 2021-04-11 22:59:54 -04:00
RazgrizandGitHub 294a04e775 Merge pull request #1765 from CHOMPStationBot/upstream-merge-10097 
[MIRROR] Fixes protean blobs using the wrong list of edible materials
 2021-04-11 19:57:58 -07:00
NadyrandGitHub c75a0f2ecb Update cart_vr.dm 2021-04-11 22:56:30 -04:00
NadyrandGitHub 93b065c8ef Merge pull request #1785 from CHOMPStationBot/upstream-merge-10122 
[MIRROR] EMV: VR Edition
 2021-04-11 22:52:17 -04:00
NadyrandGitHub 2b021722f3 Merge branch 'master' into upstream-merge-10136 2021-04-11 22:51:30 -04:00