cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,059 Commits 10 Branches 0 Tags
0151c0ad23b51a65bb3013d233d29026a022adc2
Commit Graph

2484 Commits

Author SHA1 Message Date
Nadyr
5cc75e6770 Merge pull request #1935 from CHOMPStationBot/upstream-merge-10271 
[MIRROR] Adds pizza guy uniform | CHOMP: Also manually adding wolf pelt apparently
 2021-05-11 23:26:03 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Razgriz
e38b1d0b5e Merge pull request #1915 from CHOMPStationBot/upstream-merge-10269 
[MIRROR] Adds Jams Sensors belly mode addon
 2021-05-11 15:45:00 -07:00
Chompstation Bot
c136e96487 [MIRROR] Adds verb to VV global variables 2021-05-11 13:06:50 +00:00
Chompstation Bot
8ddc95a405 Adds pizza guy uniform 2021-05-11 13:06:38 +00:00
Chompstation Bot
9e9452bd2f Readd nif softshop descriptions as tooltips 2021-05-10 07:12:36 -04:00
Novacat
ff41a0fc27 Merge pull request #10269 from Heroman3003/jam-them-sensors 
Adds Jams Sensors belly mode addon
 2021-05-09 12:55:44 +00:00
Nadyr
718abb2fe6 Merge pull request #1889 from CHOMPStationBot/upstream-merge-10246 
[MIRROR] [MIRROR] weather sounds adjustments
 2021-05-08 08:31:48 -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
Aronai Sieyes
f809f30c72 Merge pull request #10221 from Novacat/nova-basicfixes 
Disables Suit Sensors in Dorms
 2021-05-06 17:34:15 +00:00
Chompstation Bot
644108b2d9 [MIRROR] weather sounds adjustments 2021-05-05 18:46:21 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Nadyr
e0c61bacf5 Merge pull request #1795 from CHOMPStationBot/upstream-merge-10129 
[MIRROR] Miscellaneous Sundries
 2021-04-11 23:11:43 -04:00
Chompstation Bot
e26ff2e5cb Miscellaneous Sundries 2021-04-11 17:54:34 +00:00
Nadyr
99dc45013a Merge pull request #1782 from CHOMPStationBot/upstream-merge-10117 
[MIRROR] [MIRROR] Autolathes don't spam debug on first use
 2021-04-11 06:07:52 -04:00
Nadyr
a494347a7e Merge branch 'master' into upstream-merge-10095 2021-04-11 03:34:32 -04:00
Razgriz
a721affb95 Fix comment spelling 
I don't give a shit if it's a comment. You don't just edit a comment for no reason just to misspell "duplication" as "duplaction". I'm putting that back to normal. My OCD demands it.
 2021-04-10 22:20:55 -07:00
Novacat
aa8abda597 Merge pull request #10117 from VOREStation/upstream-merge-8019 
[MIRROR] Autolathes don't spam debug on first use
 2021-04-10 12:36:45 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
6ce0b7ee4e Make unnatural resizing even better and more efficient with the power of DCS™️ 2021-04-08 15:15:21 +00:00
Nadyr
8019cd3421 Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445 
[MIRROR] [MIRROR] Department and Round Goals
 2021-03-30 03:46:36 -04:00
Nadyr
2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Nadyr
b25a19712f Merge pull request #1699 from CHOMPStationBot/upstream-merge-10043 
[MIRROR] Smole world beta Quick fix.
 2021-03-30 02:40:21 -04:00
Nadyr
70c292debf Merge pull request #1695 from CHOMPStationBot/upstream-merge-10036 
[MIRROR] Makes modifying ID cards not change the department if rank wasn't changed
 2021-03-30 01:54:58 -04:00
Novacat
839b88c0fc Merge pull request #10043 from H0lySquirr3l/master 
Smole world beta Quick fix.
 2021-03-29 21:00:32 +00:00
Novacat
977e492f60 Merge pull request #10036 from Heroman3003/department-preserve 
Makes modifying ID cards not change the department if rank wasn't changed
 2021-03-29 13:43:56 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
cb17eace95 Merge pull request #1681 from CHOMPStationBot/upstream-merge-9976 
[MIRROR] Micro March beta update.
 2021-03-28 00:50:43 -04:00
Nadyr
6e406614be Merge pull request #1679 from CHOMPStationBot/upstream-merge-10023 
[MIRROR] [MIRROR] Ported updated decls repository from Neb.
 2021-03-28 00:08:04 -04:00
Nadyr
8c01fbb78d Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989 
[MIRROR] [MIRROR] New ID Card Design
 2021-03-27 21:52:28 -04:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00
Novacat
877dfbc049 Merge pull request #10023 from VOREStation/upstream-merge-8011 
[MIRROR] Ported updated decls repository from Neb.
 2021-03-26 13:46:39 +00:00
Nadyr
dfa0bd9b0f Update special_vr.dm 2021-03-26 04:09:00 -04:00
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 
[MIRROR] [MIRROR] Added think-tanks.
 2021-03-26 03:50:02 -04:00
Chompstation Bot
abc800056c [MIRROR] New ID Card Design 2021-03-23 16:15:59 +00:00
Razgriz
3802d7049a Merge pull request #1643 from CHOMPStationBot/upstream-merge-9983 
[MIRROR] Fixes https://github.com/VOREStation/VOREStation/issues/9975
 2021-03-22 01:15:20 -07:00
Novacat
98ef088fa6 Merge pull request #9986 from Meghan-Rossi/pilot_harness 
Pilots get their harness even with loadout uniform
 2021-03-21 21:53:15 +00:00
Novacat
f367e7b3fc Merge pull request #9983 from Meghan-Rossi/talon_manifest_fix 
Fixes https://github.com/VOREStation/VOREStation/issues/9975
 2021-03-21 20:13:31 +00:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 
[MIRROR] [MIRROR] Added Doctress' Jager drink.
 2021-03-21 04:31:54 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Novacat
d2b2342d74 Merge pull request #9965 from VOREStation/upstream-merge-7983 
[MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
 2021-03-18 14:40:40 +00:00
Novacat
f2fc4c8be7 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 14:40:00 +00:00
Novacat
645c134eb3 Merge pull request #9906 from Little-119/weird-helmet-begone 
Remove weird helmet thing from Forensic Technician outfit
 2021-03-11 22:21:31 +00:00
Razgriz
401784f3e8 Merge branch 'master' into upstream-merge-9445 2021-03-10 17:59:32 -07:00
Nadyr
604b71d59b Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 
[MIRROR] [MIRROR] Industrial Expansion
 2021-03-10 01:05:16 -05:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
598a7814e8 [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-09 20:17:06 +00:00
Chompstation Bot
247bcbcc24 Adds a bunch more boards to technical storage and AI law storage, makes appliance boards makeable in autolathe 2021-03-06 23:21:40 +00:00
Nadyr
3bd7e2b888 Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704 
[MIRROR] [MIRROR] Telecrystals are only stored on the mind
 2021-03-06 01:31:07 -05:00