cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,945 Commits 8 Branches 0 Tags
4ce45f8cc4a47b475a932e775c84e97bb440f8e7
Commit Graph

1332 Commits

Author SHA1 Message Date
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248 
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-09 07:39:11 -04:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Novacat
0292d2071c Merge pull request #10248 from VOREStation/upstream-merge-8058 
[MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-05 18:45:19 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
f52228af06 Merge branch 'master' into upstream-merge-9476 2021-03-28 00:41:53 -04:00
Razgriz
9d2aa87605 Update standard.dm 2021-03-25 01:05:14 -07:00
Chompstation Bot
ba2809d959 [MIRROR] Deletes unused var. 2021-03-23 23:19:34 +00:00
Nadyr
5fc2ffbee7 Merge branch 'master' into upstream-merge-9944 2021-03-21 05:15:17 -04:00
Nadyr
16b8fc040c Update standard.dm 2021-03-21 04:49:12 -04:00
Nadyr
05bcc67beb Update standard_vr.dm 2021-03-21 04:07:41 -04:00
Nadyr
63ac2eff35 Merge branch 'master' into upstream-merge-9926 2021-03-21 03:59:48 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
b4e9f36017 Fix Missing DSI Roboparts 2021-03-20 02:42:03 +00:00
Chompstation Bot
aedc3271f3 FIXES EYES 2021-03-12 06:35:47 +00:00
Novacat
2b2bcbede5 Merge pull request #9786 from VOREStation/upstream-merge-7907 
[MIRROR] Fixes some fluff weirdness with Virgo-ported prosthetics
 2021-03-11 20:59:52 +00:00
Chompstation Bot
cd8dc97836 [MIRROR] Fires nanites responsible for incorrect facial hair coloring. Hires human barber from the Bowl to dye everyone's beards 2021-03-11 20:47:34 +00:00
Nadyr
7fcacaeef1 Merge branch 'master' into upstream-merge-9828 2021-03-06 05:11:00 -05:00
Nadyr
8733d44eb3 Merge pull request #1452 from CHOMPStationBot/upstream-merge-9787 
[MIRROR] [MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
 2021-03-04 03:59:38 -05:00
Nadyr
a66d37daee Merge pull request #1453 from CHOMPStationBot/upstream-merge-9814 
[MIRROR] [MIRROR] Adds the Restraining Bolt.
 2021-03-04 03:53:12 -05:00
Nadyr
90b1b77021 Update robolimbs.dm 2021-03-04 03:49:38 -05:00
Chompstation Bot
acfa131d5b Makes all synthetic limbs freely attachable/detachable. 2021-03-04 06:18:24 +00:00
Razgriz
62bc99b8cd Merge pull request #1470 from CHOMPStationBot/upstream-merge-9829 
[MIRROR] un-nerfs Skrell veymed limbs
 2021-03-02 17:12:18 -07:00
Novacat
5be7ddc486 Merge pull request #9837 from Novacat/nova-pathfinder 
Earlyports Stair fix from Polaris
 2021-03-02 22:28:01 +00:00
Novacat
da35ec456a Merge pull request #9829 from Heroman3003/un-nerf-veymed-2 
un-nerfs Skrell veymed limbs
 2021-03-02 18:39:35 +00: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
Chompstation Bot
1aa9efb728 [MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts. 2021-02-28 23:08:29 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
15f5770983 Merge pull request #9724 from Novacat/nova-basicfixes 
Earlyports Polaris Fixes
 2021-02-15 22:48:27 +00:00
cadyn
fe84e96797 Revert "Delete defib timer" 2021-01-24 22:48:39 -08:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
cadyn
c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5 
Delete defib timer
 2021-01-24 06:52:37 -08:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
cadyn
fdbe1750cf Update organ.dm 2021-01-19 20:13:09 -08:00
cadyn
0837218461 another thingy 2021-01-16 23:08:11 -08:00
cadyn
76c3f49a0f Other thing that needed to be removed 2021-01-16 22:49:15 -08:00
Chompstation Bot
da85f80845 Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching 2020-11-24 00:54:34 +00:00
Novacat
c73420518a Merge pull request #9323 from VOREStation/upstream-merge-7759 
[MIRROR] Fix Simplemob+ Organs
 2020-11-18 22:14:58 +00:00
cadyn
8c59263e72 Update robolimbs_vr.dm 2020-11-15 16:26:22 -08:00
cadyn
9234b847af Make it more clear. 2020-11-15 16:24:55 -08:00
cadyn
a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
r4d6
47b68cbe86 Make Tesh Limbs printable again. 2020-10-25 22:48:33 -04:00
r4d6
0979453dab Make the more fancy limbs unable to be printed right away. 2020-10-24 09:06:39 -04:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
r4d6
b53e6b8a18 This one was an accident and not intended. 2020-10-22 13:05:28 -04:00
r4d6
4413a6e444 Allow more types of Prosthetic to be made and torsos are no longer black. 2020-10-22 12:56:31 -04:00