cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,235 Commits 8 Branches 0 Tags
fb550da5a2be1d28de59b33c4f7ac6b51e21f001
Commit Graph

8019 Commits

Author SHA1 Message Date
Atermonera
8565190e87 Properly fixes library computer runtime (#6455) 
* Fixes runtime in machinery/CanUseTopic() not providing correct number of arguments to ..()

* Fixes ghost interaction bug
 2019-09-15 17:10:24 -04:00
Novacat
396c8afdff Merge pull request #5838 from Mewchild/MC-Sofa 
Ports Sofas from CitRP
 2019-09-14 00:39:02 -04:00
Novacat
ab256b75b3 Merge pull request #5846 from Novacat/nova-basicfixes 
Shelter Capsule Improvements
 2019-09-14 00:38:45 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Mewchild
7462847479 Ports Sofas from CitRP 2019-09-10 00:15:07 -05:00
Unknown
d86972851a Whoops 2019-09-09 23:48:35 -04:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Novacat
f41e40cff6 Merge pull request #5812 from Heroman3003/debrisfield-filling-parttwo 
More flavor for PoIs
 2019-09-09 21:00:48 -04:00
Atermonera
153a7e118a Fixed an issue with multiple boot/shoe overlays. 2019-09-07 23:11:56 -04:00
Heroman
a1a395a1a9 Implements borg spawners 2019-09-06 16:27:51 +10:00
Novacat
ac841a8eb5 Merge pull request #5795 from Heroman3003/interceptiont 
Restricts AI intercepting messages
 2019-09-03 18:10:06 -04:00
Heroman
b3e01dc515 Restricts AI intercepting messages 2019-09-04 04:23:16 +10:00
Novacat
1c8140708b Merge pull request #5789 from Cameron653/Fixes_boots_again 
Fixes the washing bug with boots
 2019-09-03 02:19:14 -04:00
Cameron Lennox
e3073bbb5d Fixes the washing bug with boots 2019-09-03 01:34:54 -04:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
bbf1fc1420 Recommended changes 2019-08-31 15:31:45 -04:00
Novacat
a000151fbf Merge pull request #5756 from Cameron653/Boot_fix 
Fixed an issue with multiple boot/shoe overlays.
 2019-08-31 15:05:06 -04:00
Cameron Lennox
9f6e4df7eb Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. 2019-08-31 14:41:24 -04:00
Donut
964cc0e2c1 Musician.dm Fix 
The person who did the port from TG flipped the defines around. Whoops.
 2019-08-31 10:53:47 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Anewbe
083a0634a0 Merge pull request #6429 from Heroman3003/idfix 
Fixes editing colony director IDs editing global 'station access' list
 2019-08-29 18:27:58 -04:00
Novacat
a006728e5d Merge pull request #5708 from Novacat/nova-basicfixes 
Minor Fixes
 2019-08-29 15:07:28 -04:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Novacat
2c4cd96be7 Merge pull request #5396 from KasparoVy/taur_hide_stuff 
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
 2019-08-21 22:15:53 -04:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Verkister
f7a2580521 Bandaid for helper.dm runtime lag 
The latest news snippet being missing from communicator UI is a small price to pay for eliminating a severe runtime cascade for now.
 2019-08-21 18:44:20 +03:00
KasparoVy
d9b1e02405 Tails/Taurs Hide Shoes & Clip Uniforms/Suits 
Hides shoes when the goat legs or taur bodies are selected.
Adds a method by which you can clip off parts of sprites, ported from Para.

Sets goat legs & taur bodies to clip off the lower parts of uniforms and suits
so long as the clothing doesn't hide tails or is a taur suit.
 2019-08-20 01:56:08 -04:00
Novacat
dfed56f83e Merge pull request #5615 from Michiyamenotehifunana/Toricrates-Remastered 
Resprites Crates (And stuff like the cargo tug)
 2019-08-19 17:07:23 -04:00
Novacat
df9f9fff42 Merge pull request #5634 from Heroman3003/grenadefix 
Restricts station use of manhack grenades and seismic charges
 2019-08-19 16:57:04 -04:00
Heroman
4b0cc1810e Fixes a typo 2019-08-18 05:34:13 +10:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Michiyamenotehifunana
81c56fefd8 Makes Cargo Tugs Great Again (and a minor tweak) 2019-08-16 12:37:08 +08:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Michiyamenotehifunana
6c8589fa4a Whoops I missed a bit 2019-08-15 22:45:30 +08:00
Michiyamenotehifunana
3a676ad02e Adds Toricrates and stuff 2019-08-15 22:22:28 +08:00
Heroman
3e9456125a Restricts friendly manhack grenades to offstation use 2019-08-15 20:12:59 +10:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Freebie Orange Jumpsuit
 2019-08-12 14:40:23 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
Atermonera
f863fa8f7f Merge pull request #6357 from Michiyamenotehifunana/HanalSprites 
Resprites Health Analyzers and Adds Scanning Animations
 2019-08-04 17:21:03 -04:00
Spades
f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites 
Resprites Advanced Burn and Trauma Kits
 2019-08-03 07:51:27 -04:00
Spades
4ce97f4a6e Merge pull request #5478 from mistyLuminescence/defib 
Defib Scanners
 2019-08-03 07:51:14 -04:00