cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,337 Commits 7 Branches 0 Tags
eb9cee552e7abd996984f85116dc75a93faa38b7
Commit Graph

18709 Commits

Author SHA1 Message Date
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Nadyr
65946e5c49 Update misc.dm 2021-05-08 08:36:11 -04:00
Nadyr
bef7b25a07 Merge pull request #1891 from CHOMPStationBot/upstream-merge-10234 
[MIRROR] Bringing Back the Bepsi
 2021-05-08 08:32:28 -04:00
Nadyr
c1e068bd90 Update toys_vr.dm 2021-05-08 08:29:58 -04:00
Nadyr
375167cd63 Merge pull request #1907 from CHOMPStationBot/upstream-merge-10178 
[MIRROR] New belt items
 2021-05-08 08:11:11 -04:00
Nadyr
b7ea40f46c Merge pull request #1905 from CHOMPStationBot/upstream-merge-10221 
[MIRROR] Disables Suit Sensors in Dorms
 2021-05-08 08:09:27 -04:00
Nadyr
9d65893b96 Merge pull request #1901 from CHOMPStationBot/upstream-merge-10240 
[MIRROR] Removes access loss on ID contamination/digestion.
 2021-05-08 07:46:23 -04:00
Aronai Sieyes
93124538dd Merge pull request #10178 from dwinters99/light-replacer 
New belt items
 2021-05-06 17:58:51 +00:00
Aronai Sieyes
f809f30c72 Merge pull request #10221 from Novacat/nova-basicfixes 
Disables Suit Sensors in Dorms
 2021-05-06 17:34:15 +00:00
Aronai Sieyes
746eb865ed Merge pull request #10240 from Heroman3003/contamination-b-gun 
Removes access loss on ID contamination/digestion.
 2021-05-06 15:45:59 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
dcdd455b84 Bringing Back the Bepsi 2021-05-05 18:46:34 +00:00
Razgriz
ad16d9629b Merge pull request #1857 from CHOMPStationBot/upstream-merge-10210 
[MIRROR] Exploration Balance Tweaks
 2021-04-30 19:36:55 -07:00
Nadyr
6ed37fd72a Merge pull request #1866 from CHOMPStationBot/upstream-merge-10192 
[MIRROR] [MIRROR] Moves material stacks to modules/materials
 2021-04-30 02:12:51 -04:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +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
Chompstation Bot
74dd9fc236 [MIRROR] ABS shows appendicitis 2021-04-23 03:39:40 -04: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
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
33090cc00a Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157 
[MIRROR] Adminbus Update
 2021-04-21 21:24:09 -07: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
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
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
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
Chompstation Bot
36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Nadyr
50fbbb63dc Merge branch 'master' into upstream-merge-10122 2021-04-11 22:43:47 -04:00
Nadyr
505e47fc3a Merge pull request #1784 from CHOMPStationBot/upstream-merge-10115 
[MIRROR] [MIRROR] Exploration Medical Voidsuit
 2021-04-11 22:37:17 -04:00
Nadyr
663b6cfb82 Merge pull request #1787 from CHOMPStationBot/upstream-merge-10116 
[MIRROR] [MIRROR] Boda Tweaks and Russian Drinks V2
 2021-04-11 06:31:47 -04:00
Nadyr
dfe6c73e93 Merge pull request #1781 from CHOMPStationBot/upstream-merge-10121 
[MIRROR] [MIRROR] Fixes worn or held teshari not counting as successfully transferred
 2021-04-11 06:30:11 -04:00
Nadyr
24eacca663 Update game_mode.dm 2021-04-11 06:20:42 -04:00
Nadyr
693b630d1f Merge pull request #1757 from CHOMPStationBot/upstream-merge-10083 
[MIRROR] Fixup things for dm-langserver
 2021-04-11 06:09:08 -04:00
Nadyr
93d202e3fe Update core_obj.dm 2021-04-11 04:37:00 -04:00
Nadyr
04f00abe6c Update Holidays.dm 2021-04-11 04:34:56 -04:00
Nadyr
a494347a7e Merge branch 'master' into upstream-merge-10095 2021-04-11 03:34:32 -04:00
Nadyr
683d9c5f30 Merge pull request #1760 from CHOMPStationBot/upstream-merge-10092 
[MIRROR] Update resize pref and some resizing code
 2021-04-11 01:35:43 -04:00
CHOMPStationBot
83b0442129 [MIRROR] [MIRROR] Optimizes SSplanets initialization (#1788) 
* Merge pull request #10119 from VOREStation/upstream-merge-8015

[MIRROR] Optimizes SSplanets initialization

* [MIRROR] Optimizes SSplanets initialization

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
 2021-04-10 22:35:12 -07:00
CHOMPStationBot
d1de7d60b0 [MIRROR] Species cleanup (#1792) 
* Merge pull request #10127 from Nyksia/species-cleanup

Species cleanup

* Species cleanup

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
 2021-04-10 22:17:26 -07:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Nadyr
48aabf4080 Update dna2_helpers.dm 2021-04-10 22:13:56 -04:00
Novacat
d91ec5f6c1 Merge pull request #10116 from VOREStation/upstream-merge-8023 
[MIRROR] Boda Tweaks and Russian Drinks V2
 2021-04-10 14:32:12 +00:00
Chompstation Bot
1f330ac540 EMV: VR Edition 2021-04-10 13:54:24 +00:00
Chompstation Bot
f73e198519 [MIRROR] Exploration Medical Voidsuit 2021-04-10 13:54:18 +00:00