cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,269 Commits 6 Branches 0 Tags
e4d8e5263e98d6c5655d292355f17be3e986e45d
Commit Graph

1150 Commits

Author SHA1 Message Date
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
2c7d0cf851 Merge pull request #11104 from Verkister/patch-72 
Fixes organs in belly squirting blood on the floor
 2021-07-16 17:41:19 +00:00
Chompstation Bot
a7e5cce5b8 Tweak various sprites 'n things 2021-07-15 20:35:01 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Aronai Sieyes
afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333 
4 fixes
 2021-07-07 19:04:22 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Aronai Sieyes
394d5b148a Merge pull request #10562 from VOREStation/Arokha/fixprot 
Fix mistake made in 04625a5
 2021-06-06 05:24:33 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
8911fe1de3 Manual port Polaris Fixes 2021-05-22 20:22:28 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Razgriz
ba57743592 Merge branch 'master' into upstream-merge-10298 2021-05-11 15:58:14 -07:00
Chompstation Bot
a06e872c51 Tweak synth stuff 2021-05-11 22:04:18 +00:00
Razgriz
f74b9bd1ca Protean fixes 1 
Add placeholder for protean robolimbs
 2021-05-11 01:24:54 -07:00
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