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,064 Commits 7 Branches 0 Tags
43df25a5e5ea3f487daf4b5835fb49fe2c16a58f
Commit Graph

2372 Commits

Author SHA1 Message Date
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
Nadyr
715ca3ef63 Update uplink_items.dm 2021-03-06 01:11:29 -05:00
Novacat
7f7c5873d6 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 23:16:43 +00:00
Nadyr
0945ff1f1e Merge pull request #1426 from CHOMPStationBot/upstream-merge-9801 
[MIRROR] [MIRROR] Adds some tacticooler undershirts
 2021-02-28 06:10:33 -05:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
b07c6d9680 Merge pull request #9801 from VOREStation/upstream-merge-7924 
[MIRROR] Adds some tacticooler undershirts
 2021-02-26 15:20:27 +00:00
Cadyn
e10c15065a Discord HTML Manifest 2021-02-23 12:03:02 -08:00
Cadyn
ae7b89500a Fixing stuff 2021-02-22 18:17:37 -08:00
Novacat
e27799eba2 Merge pull request #9445 from VOREStation/upstream-merge-7369 
[MIRROR] Department and Round Goals
 2021-02-21 22:15:39 +00:00
Chompstation Bot
24b712ec4d [MIRROR] Telecrystals are only stored on the mind 2021-02-13 21:26:38 +00:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Novacat
aae47359c3 Merge pull request #9654 from Novacat/nova-basicfixes 
Syndicate Cruiser Tweaks
 2021-02-08 00:36:07 +00:00
Razgriz
1395175fc8 Update special_vr.dm 2021-02-02 20:59:11 -07:00